From c332d42579bd537996c226696c4a3846d81733ed Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 11 Jul 2022 21:21:18 +0200 Subject: [PATCH] Revert "- auto-set $(PKG)_MAKE_ENV = $(TARGET_CONFIGURE_ENV) for generic packages" This reverts commit 84738a0f1260d4b08d4bc26a2eeba37fd262ab1d. --- package/bzip2/bzip2.mk | 3 +++ package/duktape/duktape.mk | 3 +++ package/giflib/giflib.mk | 3 +++ package/gptfdisk/gptfdisk.mk | 3 +++ package/graphlcd-base/graphlcd-base.mk | 3 +++ package/hd-idle/hd-idle.mk | 3 +++ package/hdparm/hdparm.mk | 3 +++ package/iozone/iozone.mk | 3 +++ package/libudev-zero/libudev-zero.mk | 3 +++ package/lua-curl/lua-curl.mk | 3 +++ package/luaexpat/luaexpat.mk | 3 +++ package/ofgwrite/ofgwrite.mk | 3 +++ package/pkg-utils.mk | 6 +----- package/udpxy/udpxy.mk | 3 +++ package/vsftpd/vsftpd.mk | 4 ---- package/wpa_supplicant/wpa_supplicant.mk | 3 +++ package/xupnpd/xupnpd.mk | 3 +++ 17 files changed, 46 insertions(+), 9 deletions(-) diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index d5c30c42..11aa7c9e 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -9,6 +9,9 @@ BZIP2_DIR = bzip2-$(BZIP2_VERSION) BZIP2_SOURCE = bzip2-$(BZIP2_VERSION).tar.gz BZIP2_SITE = https://sourceware.org/pub/bzip2 +BZIP2_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + BZIP2_MAKE_OPTS = \ PREFIX=$(TARGET_prefix) diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index dc2909f1..956abffe 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -9,6 +9,9 @@ DUKTAPE_DIR = duktape-$(DUKTAPE_VERSION) DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) +DUKTAPE_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + DUKTAPE_MAKE_OPTS = \ -f Makefile.sharedlibrary INSTALL_PREFIX=$(prefix) diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 1701679e..48277a3e 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -9,6 +9,9 @@ GIFLIB_DIR = giflib-$(GIFLIB_VERSION) GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.gz GIFLIB_SITE = https://sourceforge.net/projects/giflib/files +GIFLIB_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + GIFLIB_MAKE_INSTALL_OPTS = \ PREFIX=$(prefix) \ BINDIR=$(REMOVE_bindir) \ diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 864f0d30..f272657b 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -13,6 +13,9 @@ GPTFDISK_DEPENDENCIES = popt e2fsprogs ncurses GPTFDISK_SBINARIES = sgdisk +GPTFDISK_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + GPTFDISK_MAKE_OPTS = \ $(GPTFDISK_SBINARIES) diff --git a/package/graphlcd-base/graphlcd-base.mk b/package/graphlcd-base/graphlcd-base.mk index 99f98430..b386e9f1 100644 --- a/package/graphlcd-base/graphlcd-base.mk +++ b/package/graphlcd-base/graphlcd-base.mk @@ -15,6 +15,9 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k vuduo4kse vusolo4k vuultimo4k vuu GRAPHLCD_BASE_PATCH_CUSTOM = 0005-add-vuplus-driver.patch-custom endif +GRAPHLCD_BASE_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + GRAPHLCD_BASE_MAKE_INSTALL_OPTS = \ PREFIX=$(prefix) diff --git a/package/hd-idle/hd-idle.mk b/package/hd-idle/hd-idle.mk index adbf4b1f..3d01e60e 100644 --- a/package/hd-idle/hd-idle.mk +++ b/package/hd-idle/hd-idle.mk @@ -9,6 +9,9 @@ HD_IDLE_DIR = hd-idle HD_IDLE_SOURCE = hd-idle-$(HD_IDLE_VERSION).tgz HD_IDLE_SITE = https://sourceforge.net/projects/hd-idle/files +HD_IDLE_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + define HD_IDLE_INSTALL_CMDS $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/hd-idle $(TARGET_sbindir)/hd-idle endef diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 2946d7c5..5a3f5136 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -9,6 +9,9 @@ HDPARM_DIR = hdparm-$(HDPARM_VERSION) HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz HDPARM_SITE = https://sourceforge.net/projects/hdparm/files/hdparm +HDPARM_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + HDPARM_MAKE_OPTS = \ mandir=$(REMOVE_mandir) diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 7f0bad0c..46230fda 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -18,6 +18,9 @@ else IOZONE_TARGET = linux-arm endif +IOZONE_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + IOZONE_MAKE_OPTS = \ $(IOZONE_TARGET) diff --git a/package/libudev-zero/libudev-zero.mk b/package/libudev-zero/libudev-zero.mk index c24acf17..63ce5885 100644 --- a/package/libudev-zero/libudev-zero.mk +++ b/package/libudev-zero/libudev-zero.mk @@ -9,6 +9,9 @@ LIBUDEV_ZERO_DIR = libudev-zero-$(LIBUDEV_ZERO_VERSION) LIBUDEV_ZERO_SOURCE = libudev-zero-$(LIBUDEV_ZERO_VERSION).tar.gz LIBUDEV_ZERO_SITE = $(call github,illiliti,libudev-zero,$(LIBUDEV_ZERO_VERSION)) +LIBUDEV_ZERO_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + LIBUDEV_ZERO_MAKE_OPTS = \ PREFIX=$(prefix) diff --git a/package/lua-curl/lua-curl.mk b/package/lua-curl/lua-curl.mk index ed2deb5d..039ce881 100644 --- a/package/lua-curl/lua-curl.mk +++ b/package/lua-curl/lua-curl.mk @@ -11,6 +11,9 @@ LUA_CURL_SITE = https://github.com/lua-curl LUA_CURL_DEPENDENCIES = libcurl lua +LUA_CURL_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + LUA_CURL_MAKE_OPTS = \ LIBDIR=$(TARGET_libdir) \ LUA_INC=$(TARGET_includedir) \ diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 88a19a10..22bce6af 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -11,6 +11,9 @@ LUAEXPAT_SITE = $(call github,tomasguisasola,luaexpat,v$(LUAEXPAT_VERSION)) LUAEXPAT_DEPENDENCIES = expat lua +LUAEXPAT_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + LUAEXPAT_MAKE_OPTS = \ PREFIX=$(TARGET_prefix) \ LUA_SYS_VER=$(LUA_ABIVERSION) diff --git a/package/ofgwrite/ofgwrite.mk b/package/ofgwrite/ofgwrite.mk index 9ee130cb..c45aa881 100644 --- a/package/ofgwrite/ofgwrite.mk +++ b/package/ofgwrite/ofgwrite.mk @@ -9,6 +9,9 @@ OFGWRITE_DIR = $(NI_OFGWRITE) OFGWRITE_SOURCE = $(NI_OFGWRITE) OFGWRITE_SITE = https://github.com/neutrino-images +OFGWRITE_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + define OFGWRITE_INSTALL_CMDS $(INSTALL_EXEC) $(PKG_BUILD_DIR)/ofgwrite_bin $(TARGET_bindir) $(INSTALL_EXEC) $(PKG_BUILD_DIR)/ofgwrite_caller $(TARGET_bindir) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index be573cf6..8c392968 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -109,11 +109,7 @@ ifndef $(PKG)_MAKE $(PKG)_MAKE = $$(MAKE) endif ifndef $(PKG)_MAKE_ENV - ifeq ($(PKG_MODE),GENERIC) - $(PKG)_MAKE_ENV = $$(TARGET_CONFIGURE_ENV) - else - $(PKG)_MAKE_ENV = - endif + $(PKG)_MAKE_ENV = endif ifndef $(PKG)_MAKE_ARGS $(PKG)_MAKE_ARGS = diff --git a/package/udpxy/udpxy.mk b/package/udpxy/udpxy.mk index 5d8ee867..a7a114ba 100644 --- a/package/udpxy/udpxy.mk +++ b/package/udpxy/udpxy.mk @@ -13,6 +13,9 @@ UDPXY_SUBDIR = chipmunk UDPXY_CHECKOUT = tags/1.0-25.1 +UDPXY_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + UDPXY_MAKE_OPTS = \ NO_UDPXREC=yes diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 6698f008..31a31c0c 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -13,10 +13,6 @@ VSFTPD_DEPENDENCIES = openssl VSFTPD_LIBS += -lcrypt $$($(PKG_CONFIG) --libs libssl libcrypto) -# vsftpd needs $(TARGET_CONFIGURE_ENV) in $($(PKG)_MAKE_OPTS) -VSFTPD_MAKE_ENV = \ - $(empty) - VSFTPD_MAKE_OPTS = \ $(TARGET_CONFIGURE_ENV) \ LIBS="$(VSFTPD_LIBS)" diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 18fab656..d0a8d5ad 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,6 +13,9 @@ WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DEPENDENCIES = openssl +WPA_SUPPLICANT_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + WPA_SUPPLICANT_MAKE_INSTALL_OPTS = \ BINDIR=$(sbindir) diff --git a/package/xupnpd/xupnpd.mk b/package/xupnpd/xupnpd.mk index 17b7e710..371ebeb4 100644 --- a/package/xupnpd/xupnpd.mk +++ b/package/xupnpd/xupnpd.mk @@ -15,6 +15,9 @@ XUPNPD_CHECKOUT = 25d6d44 XUPNPD_DEPENDENCIES = lua openssl +XUPNPD_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + XUPNPD_MAKE_OPTS = \ TARGET=$(TARGET) \ LUAFLAGS="$(TARGET_LDFLAGS) \