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

[<abe...@us...>]

Revision: 7661
          http://sourceforge.net/p/astlinux/code/7661
Author:   abelbeck
Date:     2016-04-29 21:30:11 +0000 (Fri, 29 Apr 2016)
Log Message:
-----------
build system, Makefile.in: add CPPFLAGS support, no longer force -fPIC globally for x86_64

Modified Paths:
--------------
    branches/1.0/package/Makefile.in
    branches/1.0/package/libpri/libpri.mk
    branches/1.0/package/prosody/prosody.mk

Modified: branches/1.0/package/Makefile.in
===================================================================
--- branches/1.0/package/Makefile.in	2016-04-29 17:29:56 UTC (rev 7660)
+++ branches/1.0/package/Makefile.in	2016-04-29 21:30:11 UTC (rev 7661)
@@ -60,25 +60,15 @@
 TARGET_DEBUGGING=-g3
 endif
 
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
-
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
-ifeq ($(BR2_x86_64),y)
-TARGET_CFLAGS+=-fPIC -DPIC
-endif # PIC for dynamic objects on x86_64
+ifeq ($(BR2_LARGEFILE),y)
+TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
-TARGET_CFLAGS+=-fno-pic -mno-abicalls
-endif
+TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
-ifeq ($(BR2_LARGEFILE),y)
-TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-endif
+TARGET_CXXFLAGS = $(TARGET_CFLAGS)
+TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
-TARGET_CXXFLAGS=$(TARGET_CFLAGS)
-TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS))
-
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
 else
@@ -136,9 +126,10 @@
 BISON:=$(shell which bison || type -p bison)
 SED:=$(shell which sed || type -p sed) -i -e
 
+HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
 HOST_CFLAGS   ?= -O2
-HOST_CFLAGS   += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
-HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
+HOST_CFLAGS   += $(HOST_CPPFLAGS)
+HOST_CXXFLAGS += $(HOST_CFLAGS)
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
 HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
 
@@ -167,12 +158,14 @@
 		CXX_FOR_BUILD="$(HOSTCXX)" \
 		FC_FOR_BUILD="$(HOSTFC)" \
 		LD_FOR_BUILD="$(HOSTLD)" \
+		CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 		FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
 		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
 		DEFAULT_LINKER="$(TARGET_LD)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -193,6 +186,7 @@
 		GCC="$(HOSTCC)" \
 		CXX="$(HOSTCXX)" \
 		CPP="$(HOSTCPP)" \
+		CPPFLAGS="$(HOST_CPPFLAGS)" \
 		CFLAGS="$(HOST_CFLAGS)" \
 		CXXFLAGS="$(HOST_CXXFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \

Modified: branches/1.0/package/libpri/libpri.mk
===================================================================
--- branches/1.0/package/libpri/libpri.mk	2016-04-29 17:29:56 UTC (rev 7660)
+++ branches/1.0/package/libpri/libpri.mk	2016-04-29 21:30:11 UTC (rev 7661)
@@ -17,7 +17,8 @@
 LIBPRI_MAKE_OPT = \
 	OSARCH=Linux \
 	INSTALL_BASE=/usr \
-	$(TARGET_CONFIGURE_OPTS)
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS) -fPIC"
 
 LIBPRI_INSTALL_STAGING_OPT = \
 	OSARCH=Linux \

Modified: branches/1.0/package/prosody/prosody.mk
===================================================================
--- branches/1.0/package/prosody/prosody.mk	2016-04-29 17:29:56 UTC (rev 7660)
+++ branches/1.0/package/prosody/prosody.mk	2016-04-29 21:30:11 UTC (rev 7661)
@@ -17,7 +17,7 @@
 		--with-lua="$(HOST_DIR)/usr" \
 		--with-lua-include="$(STAGING_DIR)/usr/include" \
 		--with-lua-lib="$(STAGING_DIR)/usr/lib" \
-		--cflags="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -fPIC -std=gnu99 -D_GNU_SOURCE" \
+		--cflags="$(TARGET_CFLAGS) -fPIC -std=gnu99 -D_GNU_SOURCE" \
 		--ldflags="$(TARGET_LDFLAGS) -shared" \
 		--datadir="/etc/prosody/data" \
 		--c-compiler='$(TARGET_CC)' \

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