patches/glibc/ports-2.10.1/100-respect-env-CPPFLAGS.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

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