patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2437
     1
Respect environment CPPFLAGS when we run ./configure so we can inject
yann@2437
     2
random -D things without having to set CFLAGS/ASFLAGS
yann@2437
     3
yann@2437
     4
diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
yann@2437
     5
--- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
yann@2437
     6
+++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100
yann@2437
     7
@@ -697,6 +697,7 @@
yann@2437
     8
 	   $(foreach lib,$(libof-$(basename $(@F))) \
yann@2437
     9
 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
yann@2437
    10
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
yann@2437
    11
+CPPFLAGS += $(CPPFLAGS-config)
yann@2437
    12
 override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
yann@2437
    13
 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
yann@2437
    14
 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
yann@2437
    15
diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in
yann@2437
    16
--- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200
yann@2437
    17
+++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100
yann@2437
    18
@@ -107,6 +107,7 @@
yann@2437
    19
 CXX = @CXX@
yann@2437
    20
 BUILD_CC = @BUILD_CC@
yann@2437
    21
 CFLAGS = @CFLAGS@
yann@2437
    22
+CPPFLAGS-config = @CPPFLAGS@
yann@2437
    23
 ASFLAGS-config = @ASFLAGS_config@
yann@2437
    24
 AR = @AR@
yann@2437
    25
 RANLIB = @RANLIB@