From 224199c2a01bb660242688aca506373e40b79775 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Jun 2014 18:12:14 +0200
Subject: optimize environment variables, reduce duplicate stuff
---
mk/build.mk | 2 +-
mk/host.mk | 24 +++++++-----------------
mk/package.mk | 40 +++++++++++-----------------------------
mk/vars.mk | 48 +++++++++++++++++++++++++++++++-----------------
4 files changed, 50 insertions(+), 64 deletions(-)
(limited to 'mk')
diff --git a/mk/build.mk b/mk/build.mk
index 0dba6cadc..44ad4fa10 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -282,7 +282,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
include ${TOPDIR}/mk/vars.mk
else
include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU SHELL
+export BASH MAKE LANGUAGE LC_ALL OStype PATH QEMU SHELL
endif
all: menuconfig
diff --git a/mk/host.mk b/mk/host.mk
index 694334589..9c5ca1caa 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -6,17 +6,13 @@ ifneq (,$(findstring host,$(MAKECMDGOALS)))
WRKDIR?= ${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
endif
-HOST_CONFIGURE_ENV+= PATH='${HOST_PATH}' \
- AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
- CONFIG_SHELL='$(strip ${SHELL})' \
+# this is environment for 'configure'
+HOST_CONFIGURE_ENV?= PATH='${HOST_PATH}' \
+ ${COMMON_ENV} \
+ ${HOST_ENV} \
PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
- PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
- CC='$(strip ${CC_FOR_BUILD})' \
- CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
- CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
- CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
- LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})'
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
# this is environment for 'make all' and 'make install'
HOST_MAKE_ENV?=
@@ -30,14 +26,8 @@ HOST_ALL_TARGET?= all
HOST_INSTALL_TARGET?= install
HOST_MAKE_ENV+= PATH='${HOST_PATH}' \
- PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
- PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
- PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
- CC='$(strip ${CC_FOR_BUILD})' \
- CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
- CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
- CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
- LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})'
+ ${COMMON_ENV} \
+ ${HOST_ENV}
HOST_MAKE_FLAGS+= ${HOST_XAKE_FLAGS} V=1
HOST_FAKE_FLAGS+= ${HOST_XAKE_FLAGS}
diff --git a/mk/package.mk b/mk/package.mk
index b8039fb5a..e3a89bc27 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -10,28 +10,18 @@ CONFIGURE_ARGS+= --enable-debug
endif
endif
-AUTOTOOL_ENV+= PATH='${AUTOTOOL_PATH}' \
- AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
- M4='${STAGING_HOST_DIR}/usr/bin/m4' \
- LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q'
+AUTOTOOL_ENV+= PATH='${HOST_PATH}' \
+ ${COMMON_ENV}
CONFIGURE_ENV+= PATH='${TARGET_PATH}' \
- GCC_HONOUR_COPTS=s \
- AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
- M4='${STAGING_HOST_DIR}/usr/bin/m4' \
- LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
- CONFIG_SHELL='$(strip ${SHELL})' \
- CFLAGS='$(strip ${TARGET_CFLAGS})' \
- CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
- CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
- LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+ ${COMMON_ENV} \
+ ${TARGET_ENV} \
PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
+ GCC_HONOUR_COPTS=s \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
- cross_compiling=yes \
- ${HOST_CONFIGURE_OPTS} \
- ${TARGET_CONFIGURE_OPTS}
+ cross_compiling=yes
CONFIGURE_PROG?= configure
MAKE_FILE?= Makefile
@@ -46,20 +36,12 @@ FAKE_FLAGS?=
ALL_TARGET?= all
INSTALL_TARGET?= install
-MAKE_ENV+= $(GCC_CHECK) \
- PATH='${TARGET_PATH}' \
- LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
- M4='${STAGING_HOST_DIR}/usr/bin/m4' \
+MAKE_ENV+= PATH='${TARGET_PATH}' \
+ ${COMMON_ENV} \
+ ${TARGET_ENV} \
+ $(GCC_CHECK) \
WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
- WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
- CFLAGS='$(strip ${TARGET_CFLAGS})' \
- CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
- CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
- LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
- PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
- PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
- ${HOST_CONFIGURE_OPTS} \
- ${TARGET_CONFIGURE_OPTS}
+ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
MAKE_FLAGS+= ${XAKE_FLAGS} V=1
FAKE_FLAGS+= ${XAKE_FLAGS}
diff --git a/mk/vars.mk b/mk/vars.mk
index 23fc166b9..b585dd6ac 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -171,11 +171,11 @@ TARGET_CXXFLAGS+= -marm
endif
endif
-# host compiler flags
-CPPFLAGS_FOR_BUILD:= -I$(STAGING_HOST_DIR)/usr/include
-CFLAGS_FOR_BUILD:= -O0 -g0
-CXXFLAGS_FOR_BUILD:= -O0 -g0
-LDFLAGS_FOR_BUILD:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
+# host compiler and linker flags
+HOST_CPPFLAGS:= -I$(STAGING_HOST_DIR)/usr/include
+HOST_CFLAGS:= -O0 -g0
+HOST_CXXFLAGS:= -O0 -g0
+HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh
PATCHP0= PATH=${HOST_PATH} patch -p0
@@ -190,26 +190,40 @@ KERNEL_MODULE_FLAGS:= ARCH=${ADK_TARGET_ARCH} \
CFLAGS_MODULE="-fhonour-copts" \
V=1
-TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \
- AR='$(TARGET_CROSS)ar' \
+COMMON_ENV= CONFIG_SHELL='$(strip ${SHELL})' \
+ AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
+ M4='${STAGING_HOST_DIR}/usr/bin/m4' \
+ LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q'
+
+TARGET_ENV= AR='$(TARGET_CROSS)ar' \
AS='$(TARGET_CROSS)as' \
LD='$(TARGET_CROSS)ld' \
NM='$(TARGET_CROSS)nm' \
RANLIB='$(TARGET_CROSS)ranlib' \
- STRIP='${TARGET_CROSS}strip' \
- OBJCOPY='${TARGET_CROSS}objcopy' \
+ STRIP='$(TARGET_CROSS)strip' \
+ OBJCOPY='$(TARGET_CROSS)objcopy' \
CC='$(TARGET_CC)' \
GCC='$(TARGET_CC)' \
CXX='$(TARGET_CXX)' \
CROSS='$(TARGET_CROSS)' \
- CROSS_COMPILE='$(TARGET_CROSS)'
-
-HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \
- CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
- CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
- CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
- CXXFLAGS_FOR_BUILD='${CXXFLAGS_FOR_BUILD}' \
- LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
+ CROSS_COMPILE='$(TARGET_CROSS)' \
+ CFLAGS='$(TARGET_CFLAGS)' \
+ CXXFLAGS='$(TARGET_CXXFLAGS)' \
+ CPPFLAGS='$(TARGET_CPPFLAGS)' \
+ LDFLAGS='$(TARGET_LDFLAGS)'
+ CC_FOR_BUILD='$(HOST_CC)' \
+ CXX_FOR_BUILD='$(HOST_CXX)' \
+ CPPFLAGS_FOR_BUILD='$(HOST_CPPFLAGS)' \
+ CFLAGS_FOR_BUILD='$(HOST_CFLAGS)' \
+ CXXFLAGS_FOR_BUILD='$(HOST_CXXFLAGS)' \
+ LDFLAGS_FOR_BUILD='$(HOST_LDFLAGS)'
+
+HOST_ENV= CC='$(HOST_CC)' \
+ CXX='$(HOST_CXX)' \
+ CPPFLAGS='$(HOST_CPPFLAGS)' \
+ CFLAGS='$(HOST_CFLAGS)' \
+ CXXFLAGS='$(HOST_CXXFLAGS)' \
+ LDFLAGS='$(HOST_LDFLAGS)'
PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
--
cgit v1.2.3