domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ucert: fix build

Browse Source 
set PKG_BUILD_DIR before including package.mk to avoid problems as
seen on buildbot.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2018-06-15 08:57:44 +02:00
parent 5e9470a93b
commit f47d7df6a8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/system/ucert/Makefile
View File

@@ -17,6 +17,8 @@ PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
@@ -24,7 +26,6 @@ include $(INCLUDE_DIR)/cmake.mk
CMAKE_HOST_OPTIONS += -DUCERT_FULL=1 -DUCERT_HOST_BUILD=1 CMAKE_HOST_OPTIONS += -DUCERT_FULL=1 -DUCERT_HOST_BUILD=1
HOST_BUILD_DEPENDS:=libubox/host libjson-c/host usign/host HOST_BUILD_DEPENDS:=libubox/host libjson-c/host usign/host
PKG_BUILD_DEPENDS:=ucert/host PKG_BUILD_DEPENDS:=ucert/host
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
define Package/ucert-full define Package/ucert-full
SECTION:=base SECTION:=base
@@ -48,6 +49,11 @@ ifeq ($(BUILD_VARIANT),full)
CMAKE_OPTIONS += -DUCERT_FULL=1 CMAKE_OPTIONS += -DUCERT_FULL=1
endif endif
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(call Build/Prepare/Default)
endef
define Package/ucert/install define Package/ucert/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucert $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucert $(1)/usr/bin