From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Jan 2011 22:37:50 +0100
Subject: activate GCC cflags check, cleanup FLAGS stuff in OpenADK.

 * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
   TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
 * activate GCC_HONOUR_COPTS and fix all packages to
   honour CFLAGS
 * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
   build compilation, remove HOST* variants
 * introduce KERNEL_MODULE_FLAGS for external kernel
   modules
 * mark rpm package as broken, mark syslinux for native builds
   only, mark libhugetlb for eglibc/glibc only usage
---
 mk/package.mk | 60 ++++++++++++-----------------------------------------------
 1 file changed, 12 insertions(+), 48 deletions(-)

(limited to 'mk/package.mk')

diff --git a/mk/package.mk b/mk/package.mk
index bacee71f4..eded9c226 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -7,32 +7,6 @@ ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
 endif
 
-TCFLAGS:=		${TARGET_CFLAGS}
-TCXXFLAGS:=		${TARGET_CFLAGS}
-TCPPFLAGS:=		${TARGET_CPPFLAGS}
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib
-ifeq ($(ADK_STATIC),y)
-TCFLAGS:=		${TARGET_CFLAGS} -static
-TCXXFLAGS:=		${TARGET_CFLAGS} -static
-TCPPFLAGS:=		${TARGET_CPPFLAGS} -static
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib \
-			-static
-endif
-ifeq ($(ADK_NATIVE),y)
-TCFLAGS:=		$(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv
-TCXXFLAGS:=		
-TCPPFLAGS:=
-TLDFLAGS:=
-endif
-
-ifeq ($(ADK_DEBUG),)
-TCPPFLAGS+=		-DNDEBUG
-endif
-
 # does not change CONFIGURE_ARGS in minimal mode
 ifeq ($(filter minimal,${CONFIG_STYLE}),)
 ifneq ($(ADK_DEBUG),)
@@ -42,10 +16,10 @@ endif
 
 CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CONFIG_SHELL='$(strip ${SHELL})' \
-			CFLAGS='$(strip ${TCFLAGS})' \
-			CXXFLAGS='$(strip ${TCXXFLAGS})' \
-			CPPFLAGS='$(strip ${TCPPFLAGS})' \
-			LDFLAGS='$(strip ${TLDFLAGS})' \
+			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'
 ifeq ($(ADK_NATIVE),)
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
@@ -67,26 +41,16 @@ FAKE_FLAGS?=
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
 
-MAKE_ENV+=		WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
+MAKE_ENV+=		GCC_HONOUR_COPTS=2 \
+			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
-			CFLAGS='$(strip ${TCFLAGS})' \
-			CXXFLAGS='$(strip ${TCXXFLAGS})' \
-			CPPFLAGS='$(strip ${TCPPFLAGS})' \
-			LDFLAGS='$(strip ${TLDFLAGS})'
-MAKE_ENV+=		PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
+			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'
 ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		PATH='${TARGET_PATH}' \
-			${HOST_CONFIGURE_OPTS} \
-			CC='${TARGET_CC}' \
-			CXX='${TARGET_CXX}' \
-			LD='${TARGET_LD}' \
-			AR='${TARGET_CROSS}ar' \
-			RANLIB='${TARGET_CROSS}ranlib' \
-			NM='${TARGET_CROSS}nm' \
-			OBJCOPY='${TARGET_CROSS}objcopy' \
-			RANLIB='${TARGET_CROSS}ranlib' \
-			STRIP='${TARGET_CROSS}strip' \
-			CROSS="$(TARGET_CROSS)"
+MAKE_ENV+=		${TARGET_CONFIGURE_OPTS} ${HOST_CONFIGURE_OPTS}
 endif
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
-- 
cgit v1.2.3