optimize environment variables, reduce duplicate stuff

5 files changed, 8 insertions, 6 deletions

diff --git a/package/Makefile b/package/Makefile
index 71fef58d1..c1c2cd241 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -55,7 +55,7 @@ endif
 
 %-compile:
 	$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "
-	if test -f $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \
+	@if test -f $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \
 		$(MAKE) -C $(patsubst %-compile,%,$@) clean ; \
 		rm $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@) ; \
 	fi
diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile
index 4654aa90f..9ed57e401 100644
--- a/package/adk-helper/Makefile
+++ b/package/adk-helper/Makefile
@@ -21,8 +21,8 @@ $(eval $(call HOST_template,ADK_HELPER,adk-helper,${PKG_VERSION}-${PKG_RELEASE})
 HOST_STYLE:=		manual
 
 host-build:
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o ${WRKBUILD}/mkcrypt ${WRKBUILD}/mkcrypt.c
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o ${WRKBUILD}/dkgetsz ${WRKBUILD}/dkgetsz.c
+	$(HOST_CC) $(HOST_CFLAGS) -o ${WRKBUILD}/mkcrypt ${WRKBUILD}/mkcrypt.c
+	$(HOST_CC) $(HOST_CFLAGS) -o ${WRKBUILD}/dkgetsz ${WRKBUILD}/dkgetsz.c
 
 adk-helper-hostinstall:
 	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin
diff --git a/package/mkimage/Makefile b/package/mkimage/Makefile
index 8e6fa6bdd..ac68c32d0 100644
--- a/package/mkimage/Makefile
+++ b/package/mkimage/Makefile
@@ -22,7 +22,7 @@ $(eval $(call HOST_template,MKIMAGE,mkimage,$(PKG_VERSION)-${PKG_RELEASE}))
 HOST_STYLE:=		manual
 
 host-build:
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o ${WRKBUILD}/mkimage \
+	$(HOST_CC) $(HOST_CFLAGS) -o ${WRKBUILD}/mkimage \
 		${WRKBUILD}/mkimage.c ${WRKBUILD}/crc32.c
 
 mkimage-hostinstall:
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 94f63f8ba..a3d23a0f6 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -85,6 +85,8 @@ $(eval $(call PKG_mod_template,PYTHON2_MOD_NCURSES,_curses))
 $(eval $(call PKG_mod_template,PYTHON2_MOD_SSL,_ssl))
 $(eval $(call PKG_mod_template,PYTHON2_MOD_READLINE,readline))
 
+HOST_CFLAGS+=		-fPIC
+
 AUTOTOOL_STYLE:=	autoreconf
 MAKE_ENV+=		HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen
 CONFIGURE_ENV+=         ac_cv_have_long_long_format=yes \
@@ -101,7 +103,6 @@ HOST_CONFIGURE_ARGS+=	--with-threads \
 			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
-CFLAGS_FOR_BUILD+=	-fPIC
 
 hostpre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index accc99c5c..f9abd41ac 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -57,6 +57,8 @@ $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
 $(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT}))
 
+TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ENV+=		have_scanf_alloc_modifier=yes \
 			scanf_cv_alloc_modifier=ms
 CONFIGURE_ARGS+=	--disable-use-tty-group \
@@ -72,7 +74,6 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--with-ncurses=$(STAGING_TARGET_DIR)/usr/include \
 			--libdir=/usr/lib
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
-TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo
 
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin