[Astlinux-commits] SF.net SVN: astlinux:[7909] branches/1.0/package

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7909
          http://sourceforge.net/p/astlinux/code/7909
Author:   abelbeck
Date:     2016-11-02 17:40:03 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
build system, use  when calling , from upstream Buildroot, mostly to set /usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/dev/.local/bin:/home/dev/bin to find host variants, followup to r7893

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/7893

Modified Paths:
--------------
    branches/1.0/package/bfdetect/bfdetect.mk
    branches/1.0/package/dhcpdump/dhcpdump.mk
    branches/1.0/package/dosfstools/dosfstools.mk
    branches/1.0/package/htpasswd/htpasswd.mk
    branches/1.0/package/lm-sensors/lm-sensors.mk
    branches/1.0/package/lua/lua.mk
    branches/1.0/package/luaexpat/luaexpat.mk
    branches/1.0/package/luafilesystem/luafilesystem.mk
    branches/1.0/package/luasec/luasec.mk
    branches/1.0/package/luasocket/luasocket.mk
    branches/1.0/package/memtest/memtest.mk
    branches/1.0/package/miniupnpd/miniupnpd.mk
    branches/1.0/package/perl/perl.mk
    branches/1.0/package/pppd/pppd.mk
    branches/1.0/package/sudo/sudo.mk
    branches/1.0/package/vsftpd/vsftpd.mk

Modified: branches/1.0/package/bfdetect/bfdetect.mk
===================================================================

--- branches/1.0/package/bfdetect/bfdetect.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/bfdetect/bfdetect.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -23,7 +23,7 @@
 
 $(BFDETECT_DIR)/$(BFDETECT_BINARY): $(BFDETECT_DIR)/.configured
 	$(SED) 's/^[[:space:]]*strip /#strip /' $(BFDETECT_DIR)/Makefile
-	$(MAKE) CC=$(TARGET_CC) CFLAGS='$(TARGET_CFLAGS)' -C $(BFDETECT_DIR) 
+	$(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) CFLAGS='$(TARGET_CFLAGS)' -C $(BFDETECT_DIR) 
 
 $(TARGET_DIR)/$(BFDETECT_TARGET_BINARY): $(BFDETECT_DIR)/$(BFDETECT_BINARY)
 	$(INSTALL) -D -m 0755 $(BFDETECT_DIR)/$(BFDETECT_BINARY) $(TARGET_DIR)/$(BFDETECT_TARGET_BINARY)

Modified: branches/1.0/package/dhcpdump/dhcpdump.mk
===================================================================
--- branches/1.0/package/dhcpdump/dhcpdump.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/dhcpdump/dhcpdump.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -11,7 +11,7 @@
 DHCPDUMP_DEPENDENCIES = libpcap
 
 define DHCPDUMP_BUILD_CMDS
-	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)"
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)"
 endef
 
 define DHCPDUMP_INSTALL_TARGET_CMDS

Modified: branches/1.0/package/dosfstools/dosfstools.mk
===================================================================
--- branches/1.0/package/dosfstools/dosfstools.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/dosfstools/dosfstools.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -21,7 +21,7 @@
 MKFS_FAT_MKDOSFS_LINK = mkdosfs
 
 define DOSFSTOOLS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D)
 endef
 
 DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL)+=$(FATLABEL_BINARY)

Modified: branches/1.0/package/htpasswd/htpasswd.mk
===================================================================
--- branches/1.0/package/htpasswd/htpasswd.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/htpasswd/htpasswd.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -17,7 +17,7 @@
 	touch $@
 
 $(HTPASSWD_DIR)/$(HTPASSWD_BINARY): $(HTPASSWD_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 	CFLAGS='$(TARGET_CFLAGS)' \
 	LDFLAGS='$(TARGET_LDFLAGS)' \
 	-C $(HTPASSWD_DIR)

Modified: branches/1.0/package/lm-sensors/lm-sensors.mk
===================================================================
--- branches/1.0/package/lm-sensors/lm-sensors.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/lm-sensors/lm-sensors.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -19,21 +19,21 @@
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 define LM_SENSORS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) \
 		PREFIX=/usr -C $(@D)
 endef
 
 define LM_SENSORS_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) install
 	rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
 endef
 
 define LM_SENSORS_UNINSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) uninstall
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) uninstall
 endef
 
 define LM_SENSORS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
 	$(INSTALL) -D -m 0755 package/lm-sensors/lm-sensors.init $(TARGET_DIR)/etc/init.d/lmsensors
 	mv $(TARGET_DIR)/etc/sensors3.conf $(TARGET_DIR)/stat/etc/sensors.conf.default
 	ln -sf /tmp/etc/sensors3.conf $(TARGET_DIR)/etc/sensors3.conf
@@ -42,7 +42,7 @@
 endef
 
 define LM_SENSORS_UNINSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) uninstall
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) uninstall
 endef
 
 define LM_SENSORS_CLEAN_CMDS

Modified: branches/1.0/package/lua/lua.mk
===================================================================
--- branches/1.0/package/lua/lua.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/lua/lua.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -20,7 +20,7 @@
 HOST_LUA_LDFLAGS = -Wl,-rpath,$(HOST_DIR)/usr/lib
 
 define LUA_BUILD_CMDS
-	$(MAKE) \
+	$(TARGET_MAKE_ENV) $(MAKE) \
 	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
 	CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \
 	MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \
@@ -28,7 +28,7 @@
 endef
 
 define HOST_LUA_BUILD_CMDS
-	$(MAKE) \
+	$(HOST_MAKE_ENV) $(MAKE) \
 	CFLAGS="$(HOST_LUA_CFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
 	MYLDFLAGS="$(HOST_LUA_LDFLAGS)" \

Modified: branches/1.0/package/luaexpat/luaexpat.mk
===================================================================
--- branches/1.0/package/luaexpat/luaexpat.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/luaexpat/luaexpat.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -17,7 +17,7 @@
 
 
 define LUAEXPAT_BUILD_CMDS
-	$(MAKE) -C $(@D) $(LUAEXPAT_MFLAGS)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LUAEXPAT_MFLAGS)
 endef
 
 define LUAEXPAT_INSTALL_TARGET_CMDS

Modified: branches/1.0/package/luafilesystem/luafilesystem.mk
===================================================================
--- branches/1.0/package/luafilesystem/luafilesystem.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/luafilesystem/luafilesystem.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -13,7 +13,7 @@
 endif
 
 define LUAFILESYSTEM_BUILD_CMDS
-	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) $(LFS_CFLAGS) -fPIC"
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) $(LFS_CFLAGS) -fPIC"
 endef
 
 define LUAFILESYSTEM_INSTALL_TARGET_CMDS

Modified: branches/1.0/package/luasec/luasec.mk
===================================================================
--- branches/1.0/package/luasec/luasec.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/luasec/luasec.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -10,7 +10,7 @@
 LUASEC_DEPENDENCIES = lua openssl luasocket
 
 define LUASEC_BUILD_CMDS
-	$(MAKE) -C $(@D) linux \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) linux \
 		INC_PATH="" \
 		LIB_PATH="" \
 		LIBDIR="-L$(STAGING_DIR)/usr/lib/ -L$(@D)/src/luasocket" \
@@ -19,7 +19,7 @@
 endef
 
 define LUASEC_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) install \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
 		LUACPATH="$(TARGET_DIR)/usr/lib/lua" \
 		LUAPATH="$(TARGET_DIR)/usr/share/lua"
 endef

Modified: branches/1.0/package/luasocket/luasocket.mk
===================================================================
--- branches/1.0/package/luasocket/luasocket.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/luasocket/luasocket.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -11,12 +11,12 @@
 LUASOCKET_DEPENDENCIES = lua
 
 define LUASOCKET_BUILD_CMDS
-	$(MAKE) -C $(@D) -f makefile \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f makefile \
 		CC="$(TARGET_CC)" LD="$(TARGET_CC)"
 endef
 
 define LUASOCKET_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) -f makefile \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f makefile \
 		INSTALL_TOP_LDIR="$(TARGET_DIR)/usr/share/lua" \
 		INSTALL_TOP_CDIR="$(TARGET_DIR)/usr/lib/lua" install-unix
 endef

Modified: branches/1.0/package/memtest/memtest.mk
===================================================================
--- branches/1.0/package/memtest/memtest.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/memtest/memtest.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -23,7 +23,7 @@
 	touch $@
 
 $(MEMTEST_DIR)/$(MEMTEST_BIN): $(MEMTEST_DIR)/.configured
-	$(MAKE1) -C $(MEMTEST_DIR) CC=$(TARGET_CC) memtest.bin
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(MEMTEST_DIR) CC=$(TARGET_CC) memtest.bin
 
 memtest: $(MEMTEST_DIR)/$(MEMTEST_BIN)
 

Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -24,7 +24,7 @@
 define MINIUPNPD_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) \
 	CONFIG_OPTIONS="--leasefile --portinuse --vendorcfg --disable-pppconn" \
-	$(MAKE) -f Makefile.linux -C $(@D) miniupnpd
+	$(TARGET_MAKE_ENV) $(MAKE) -f Makefile.linux -C $(@D) miniupnpd
 endef
 
 define MINIUPNPD_INSTALL_TARGET_CMDS

Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/perl/perl.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -73,22 +73,23 @@
 endif
 
 define PERL_CONFIGURE_CMDS
-	(cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
+	(cd $(@D); $(TARGET_MAKE_ENV) HOSTCC='$(HOSTCC_NOCACHE)' \
+		./configure $(PERL_CONF_OPT))
 	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
 endef
 
 define PERL_BUILD_CMDS
-	$(MAKE1) -C $(@D) all
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all
 endef
 
 define PERL_INSTALL_STAGING_CMDS
-	$(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl
 endef
 
 define PERL_INSTALL_TARGET_CMDS
 	# Undefine utils.lst file so cpan, corelist, ... perlthanks are not installed, keep shasum
 	echo "utils/shasum" > $(@D)/utils.lst
-	$(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl
 	# Remove CORE dir
 	rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE
 	# Remove all .pod files

Modified: branches/1.0/package/pppd/pppd.mk
===================================================================
--- branches/1.0/package/pppd/pppd.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/pppd/pppd.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -26,11 +26,11 @@
 define PPPD_CONFIGURE_CMDS
 	$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
 	$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
-	( cd $(@D); ./configure --prefix=/usr )
+	( cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr )
 endef
 
 define PPPD_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
 		-C $(@D) $(PPPD_MAKE_OPT)
 endef
 
@@ -90,7 +90,7 @@
 endef
 
 define PPPD_INSTALL_STAGING_CMDS
-	$(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
+	$(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
 endef
 
 $(eval $(call GENTARGETS,package,pppd))

Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/sudo/sudo.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -21,7 +21,7 @@
 
 # mksigname/mksiglist needs to run on build host to generate source files
 define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
-	$(MAKE) $(HOST_CONFIGURE_OPTS) \
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
 		CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \
 		-C $(@D)/lib/util mksigname mksiglist
 endef

Modified: branches/1.0/package/vsftpd/vsftpd.mk
===================================================================
--- branches/1.0/package/vsftpd/vsftpd.mk	2016-11-02 15:26:01 UTC (rev 7908)
+++ branches/1.0/package/vsftpd/vsftpd.mk	2016-11-02 17:40:03 UTC (rev 7909)
@@ -25,7 +25,7 @@
 endif
 
 define VSFTPD_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)
 endef
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



