소스 검색

ucert: fix build

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

Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle 7 년 전
부모
커밋
f47d7df6a8
1개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 7 1
      package/system/ucert/Makefile

+ 7 - 1
package/system/ucert/Makefile

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