Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cjdns: remove PKG_BUILD_DIR

Browse source 
Signed-off-by: William Fleurant <meshnet@protonmail.com>
This commit is contained in:
William Fleurant 2019-11-07 12:50:25 -05:00
parent 998c4088bb
commit 7e104127c4
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cjdns/Makefile
View file

@ -27,8 +27,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
PKG_MIRROR_HASH:=fd694d9c33b68274647efe5081c5053068a499e2079d05434be6c7b4d18451d9 PKG_MIRROR_HASH:=fd694d9c33b68274647efe5081c5053068a499e2079d05434be6c7b4d18451d9
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com> PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -79,8 +77,8 @@ PKG_DO_VARS+= UCLIBC=1
endif endif
define Build/Compile define Build/Compile
$(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp $(INSTALL_DIR) $(BUILD_DIR)/$(PKG_NAME)/tmp
(cd $(PKG_BUILD_DIR) && \ (cd $(BUILD_DIR)/$(PKG_NAME) && \
CROSS="true" \ CROSS="true" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
AR="$(TARGET_AR)" \ AR="$(TARGET_AR)" \
@ -91,7 +89,7 @@ define Build/Compile
TARGET_ARCH="$(CONFIG_ARCH)" \ TARGET_ARCH="$(CONFIG_ARCH)" \
SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \ SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
GYP_ADDITIONAL_ARGS="-f make-linux" \ GYP_ADDITIONAL_ARGS="-f make-linux" \
CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \ CJDNS_BUILD_TMPDIR="$(BUILD_DIR)/$(PKG_NAME)/tmp" \
$(PKG_DO_VARS) \ $(PKG_DO_VARS) \
exec ./do) exec ./do)
endef endef
@ -110,11 +108,11 @@ define Package/cjdns/install
$(1)/usr/bin $(1)/usr/bin
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_BUILD_DIR)/cjdroute \ $(BUILD_DIR)/$(PKG_NAME)/cjdroute \
$(1)/usr/sbin $(1)/usr/sbin
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_BUILD_DIR)/publictoip6 \ $(BUILD_DIR)/$(PKG_NAME)/publictoip6 \
$(1)/usr/bin $(1)/usr/bin
$(INSTALL_BIN) \ $(INSTALL_BIN) \
@ -142,7 +140,7 @@ endef
define Package/cjdns-tests/install define Package/cjdns-tests/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_BUILD_DIR)/build_linux/test_testcjdroute_c \ $(BUILD_DIR)/$(PKG_NAME)/build_linux/test_testcjdroute_c \
$(1)/usr/bin $(1)/usr/bin
endef endef