From d2e4376ada7df2042c06bd37088e2151b3736234 Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Mon, 2 May 2016 01:54:53 +0200 Subject: [PATCH] libzdb: copy host built tool to "$(STAGING_DIR)/host" instead Signed-off-by: Gergely Kiss --- libs/libzdb/Makefile | 4 ++-- libs/libzdb/patches/020-filterh-use-host-built-version.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libzdb/Makefile b/libs/libzdb/Makefile index 8f6db1bac..13a2d62f5 100644 --- a/libs/libzdb/Makefile +++ b/libs/libzdb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzdb PKG_VERSION:=3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -64,7 +64,7 @@ endef define Host/Install $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOST)/bin/ + $(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR)/host/bin/ endef $(eval $(call HostBuild)) diff --git a/libs/libzdb/patches/020-filterh-use-host-built-version.patch b/libs/libzdb/patches/020-filterh-use-host-built-version.patch index 74c166a6c..1edfd77b3 100644 --- a/libs/libzdb/patches/020-filterh-use-host-built-version.patch +++ b/libs/libzdb/patches/020-filterh-use-host-built-version.patch @@ -14,7 +14,7 @@ diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am RE2C = @RE2C@ RE2CFLAGS = -b -FILTERH = ./tools/bin/filterh -+FILTERH = $(STAGING_DIR_HOST)/bin/filterh ++FILTERH = $(STAGING_DIR)/host/bin/filterh AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS) AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions