From fbb698c7ec5fb1c6201f7729d4cca55e7fbd020f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 21 Jul 2019 07:11:48 +0200 Subject: [PATCH] Revert "- rename BUILDENV => BUILD_ENV" This reverts commit 23aacce149a1abfbee06d793cce73fd9855d2415. --- make/environment-build.mk | 6 +++--- make/host-tools.mk | 2 +- make/neutrino-plugins.mk | 2 +- make/neutrino.mk | 8 ++++---- make/target-libs-unused.mk | 4 ++-- make/target-libs.mk | 2 +- make/target-lua.mk | 4 ++-- make/target-tools-unused.mk | 2 +- make/target-tools.mk | 16 ++++++++-------- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/make/environment-build.mk b/make/environment-build.mk index 091e3b1f..d84a4381 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -334,7 +334,7 @@ MAKE_OPTS = \ STRIP="$(TARGET_STRIP)" \ ARCH=$(BOXARCH) -BUILD_ENV = \ +BUILDENV = \ $(MAKE_OPTS) \ \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -342,7 +342,7 @@ BUILD_ENV = \ CXXFLAGS="$(TARGET_CXXFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ -BUILD_ENV += \ +BUILDENV += \ PKG_CONFIG=$(PKG_CONFIG) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @@ -352,7 +352,7 @@ CONFIGURE_OPTS = \ CONFIGURE = \ test -f ./configure || ./autogen.sh && \ - $(BUILD_ENV) \ + $(BUILDENV) \ ./configure $(CONFIGURE_OPTS) # ----------------------------------------------------------------------------- diff --git a/make/host-tools.mk b/make/host-tools.mk index dbef6458..0ce5347f 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -308,7 +308,7 @@ HOST_LUAROCKS_PATCH = luarocks-0001-allow-libluajit-detection.patch HOST_LUAROCKS_CONFIG_FILE = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua -HOST_LUAROCKS_BUILD_ENV = \ +HOST_LUAROCKS_BUILDENV = \ LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVER)/?.lua" \ TARGET_CC="$(TARGET_CC)" \ TARGET_LD="$(TARGET_LD)" \ diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 60878377..22c982ee 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -54,7 +54,7 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS) test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh $(CD) $(NP_OBJ_DIR); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ diff --git a/make/neutrino.mk b/make/neutrino.mk index 572ad3b3..addec684 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -110,7 +110,7 @@ N_WEATHER_DEV_KEY ?= # ----------------------------------------------------------------------------- -N_BUILD_ENV = \ +N_BUILDENV = \ $(MAKE_OPTS) \ \ CFLAGS="$(N_CFLAGS)" \ @@ -118,7 +118,7 @@ N_BUILD_ENV = \ CXXFLAGS="$(N_CFLAGS) -std=c++11" \ LDFLAGS="$(N_LDFLAGS)" -N_BUILD_ENV += \ +N_BUILDENV += \ PKG_CONFIG=$(PKG_CONFIG) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @@ -130,7 +130,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS) git checkout $(NI-NEUTRINO_BRANCH) $(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh $(CD) $(N_OBJ_DIR); \ - $(N_BUILD_ENV) \ + $(N_BUILDENV) \ $(SOURCE_DIR)/$(NI-NEUTRINO)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ @@ -203,7 +203,7 @@ $(LH_OBJ_DIR)/config.status: $(LH_DEPS) test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR) $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh $(CD) $(LH_OBJ_DIR); \ - $(N_BUILD_ENV) \ + $(N_BUILDENV) \ $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index ffa2b083..ee3938a1 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -109,7 +109,7 @@ $(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(BZIP2_TMP); \ $(call apply_patches, $(BZIP2_PATCH)); \ mv Makefile-libbz2_so Makefile; \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) all; \ $(MAKE) install PREFIX=$(TARGET_DIR) rm -f $(TARGET_DIR)/bin/bzip2 @@ -195,7 +195,7 @@ $(D)/cairo: $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHI $(UNTAR)/$(CAIRO_SOURCE) $(CHDIR)/$(CAIRO_TMP); \ $(call apply_patches, $(CAIRO_PATCH)); \ - $(BUILD_ENV) \ + $(BUILDENV) \ ax_cv_c_float_words_bigendian="no" \ ./configure $(CONFIGURE_OPTS) \ --prefix= \ diff --git a/make/target-libs.mk b/make/target-libs.mk index 8ad43409..82c2bd64 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -19,7 +19,7 @@ $(D)/zlib: $(ARCHIVE)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(ZLIB_SOURCE) $(CHDIR)/$(ZLIB_TMP); \ $(call apply_patches, $(ZLIB_PATCH)); \ - $(BUILD_ENV) \ + $(BUILDENV) \ mandir=$(remove-mandir) \ ./configure \ --prefix= \ diff --git a/make/target-lua.mk b/make/target-lua.mk index f9118b6e..97e53d84 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -58,7 +58,7 @@ $(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(LUAEXPAT_SOURCE) $(CHDIR)/$(LUAEXPAT_TMP); \ $(call apply_patches, $(LUAEXPAT_PATCH)); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) \ PREFIX=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -114,7 +114,7 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR) get-git-source.sh $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE) $(CPDIR)/$(LUACURL_SOURCE) $(CHDIR)/$(LUACURL_TMP); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) \ LIBDIR=$(TARGET_LIB_DIR) \ LUA_INC=$(TARGET_INCLUDE_DIR); \ diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index d387b056..2a4fbee1 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -157,7 +157,7 @@ $(D)/iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR) $(CHDIR)/$(IOZONE_TMP)/src/current; \ sed -i -e "s/= gcc/= $(TARGET_CC)/" makefile; \ sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) linux-arm; \ install -m 0755 iozone $(TARGET_BIN_DIR)/ $(REMOVE)/$(IOZONE_TMP) diff --git a/make/target-tools.mk b/make/target-tools.mk index ada2eda7..8896ea36 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -283,7 +283,7 @@ $(D)/hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HDPARM_TMP) $(UNTAR)/$(HDPARM_SOURCE) $(CHDIR)/$(HDPARM_TMP); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE); \ install -D -m 0755 hdparm $(TARGET_DIR)/sbin/hdparm $(REMOVE)/$(HDPARM_TMP) @@ -303,7 +303,7 @@ $(D)/hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HD-IDLE_TMP) $(UNTAR)/$(HD-IDLE_SOURCE) $(CHDIR)/$(HD-IDLE_TMP); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE); \ install -D -m 0755 hd-idle $(TARGET_DIR)/sbin/hd-idle $(REMOVE)/$(HD-IDLE_TMP) @@ -463,7 +463,7 @@ $(D)/ushare: $(D)/libupnp $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR) $(UNTAR)/$(USHARE_SOURCE) $(CHDIR)/$(USHARE_TMP); \ $(call apply_patches, $(USHARE_PATCH)); \ - $(BUILD_ENV) \ + $(BUILDENV) \ ./configure \ --prefix= \ --disable-dlna \ @@ -563,7 +563,7 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR) sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ $(MAKE) clean; \ - $(MAKE) $(BUILD_ENV) LIBS="-lcrypt -lcrypto -lssl"; \ + $(MAKE) $(BUILDENV) LIBS="-lcrypt -lcrypto -lssl"; \ install -D -m 0755 vsftpd $(TARGET_DIR)/sbin/vsftpd install -d $(TARGET_SHARE_DIR)/empty install -D -m 0644 $(IMAGEFILES)/scripts/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf @@ -1167,7 +1167,7 @@ $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET $(UNTAR)/$(WPA_SUPPLICANT_SOURCE) $(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \ cp $(CONFIGS)/wpa_supplicant.config .config; \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin install -D -m 0755 $(IMAGEFILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh @@ -1195,7 +1195,7 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR) $(CHDIR)/$(XUPNPD_TMP); \ $(call apply_patches, $(XUPNPD_PATCH)) $(CHDIR)/$(XUPNPD_TMP)/src; \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \ install -D -m 0755 xupnpd $(TARGET_BIN_DIR)/; \ install -d $(TARGET_SHARE_DIR)/xupnpd/config; \ @@ -1555,7 +1555,7 @@ $(D)/ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) $(REMOVE)/$(NI-OFGWRITE) tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x $(CHDIR)/$(NI-OFGWRITE); \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin @@ -1655,7 +1655,7 @@ $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET $(call apply_patches, $(GPTFDISK_PATCH)); \ sed -i 's|^CC=.*|CC=$(TARGET_CC)|' Makefile; \ sed -i 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \ - $(BUILD_ENV) \ + $(BUILDENV) \ $(MAKE) sgdisk; \ install -D -m 0755 sgdisk $(TARGET_DIR)/sbin/sgdisk $(REMOVE)/$(GPTFDISK_TMP)