- auto-set $(PKG)_MAKE_ENV = $(TARGET_CONFIGURE_ENV) for generic packages

package/bzip2/bzip2.mk

@@ -9,9 +9,6 @@ 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)
 

package/duktape/duktape.mk

@@ -9,9 +9,6 @@ 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)
 

package/giflib/giflib.mk

@@ -9,9 +9,6 @@ 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) \

package/gptfdisk/gptfdisk.mk

@@ -13,9 +13,6 @@ GPTFDISK_DEPENDENCIES = popt e2fsprogs ncurses
 
 GPTFDISK_SBINARIES = sgdisk
 
-GPTFDISK_MAKE_ENV = \
-	$(TARGET_CONFIGURE_ENV)
-
 GPTFDISK_MAKE_OPTS = \
 	$(GPTFDISK_SBINARIES)
 

package/graphlcd-base/graphlcd-base.mk

@@ -15,9 +15,6 @@ 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)
 

package/hd-idle/hd-idle.mk

@@ -9,9 +9,6 @@ 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

package/hdparm/hdparm.mk

@@ -9,9 +9,6 @@ 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)
 

package/iozone/iozone.mk

@@ -18,9 +18,6 @@ else
 IOZONE_TARGET = linux-arm
 endif
 
-IOZONE_MAKE_ENV = \
-	$(TARGET_CONFIGURE_ENV)
-
 IOZONE_MAKE_OPTS = \
 	$(IOZONE_TARGET)
 

package/libudev-zero/libudev-zero.mk

@@ -9,9 +9,6 @@ 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)
 

package/lua-curl/lua-curl.mk

@@ -11,9 +11,6 @@ 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) \

package/luaexpat/luaexpat.mk

@@ -11,9 +11,6 @@ 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)

package/ofgwrite/ofgwrite.mk

@@ -9,9 +9,6 @@ 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)

package/pkg-utils.mk

@@ -109,7 +109,11 @@ ifndef $(PKG)_MAKE
   $(PKG)_MAKE = $$(MAKE)
 endif
 ifndef $(PKG)_MAKE_ENV
-  $(PKG)_MAKE_ENV =
+  ifeq ($(PKG_MODE),GENERIC)
+    $(PKG)_MAKE_ENV = $$(TARGET_CONFIGURE_ENV)
+  else
+    $(PKG)_MAKE_ENV =
+  endif
 endif
 ifndef $(PKG)_MAKE_ARGS
   $(PKG)_MAKE_ARGS =

package/udpxy/udpxy.mk

@@ -13,9 +13,6 @@ UDPXY_SUBDIR = chipmunk
 
 UDPXY_CHECKOUT = tags/1.0-25.1
 
-UDPXY_MAKE_ENV = \
-	$(TARGET_CONFIGURE_ENV)
-
 UDPXY_MAKE_OPTS = \
 	NO_UDPXREC=yes
 

package/vsftpd/vsftpd.mk

@@ -13,6 +13,10 @@ 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)"

package/wpa_supplicant/wpa_supplicant.mk

@@ -13,9 +13,6 @@ WPA_SUPPLICANT_SUBDIR = wpa_supplicant
 
 WPA_SUPPLICANT_DEPENDENCIES = openssl
 
-WPA_SUPPLICANT_MAKE_ENV = \
-	$(TARGET_CONFIGURE_ENV)
-
 WPA_SUPPLICANT_MAKE_INSTALL_OPTS = \
 	BINDIR=$(sbindir)
 

package/xupnpd/xupnpd.mk

@@ -15,9 +15,6 @@ XUPNPD_CHECKOUT = 25d6d44
 
 XUPNPD_DEPENDENCIES = lua openssl
 
-XUPNPD_MAKE_ENV = \
-	$(TARGET_CONFIGURE_ENV)
-
 XUPNPD_MAKE_OPTS = \
 	TARGET=$(TARGET) \
 	LUAFLAGS="$(TARGET_LDFLAGS) \