patches/glibc/2.9/110-respect-env-CPPFLAGS.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 1201 c9967a6e3b25
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771)
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/0030_all_glibc-respect-env-CPPFLAGS.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
Respect environment CPPFLAGS when we run ./configure so we can inject
yann@1201
     5
random -D things without having to set CFLAGS/ASFLAGS
yann@1201
     6
yann@1201
     7
-= END original header =-
yann@1201
     8
yann@1201
     9
diff -durN glibc-2_9.orig/Makeconfig glibc-2_9/Makeconfig
yann@1201
    10
--- glibc-2_9.orig/Makeconfig	2008-08-18 11:42:17.000000000 +0200
yann@1201
    11
+++ glibc-2_9/Makeconfig	2009-02-02 22:00:35.000000000 +0100
yann@1201
    12
@@ -673,6 +673,7 @@
yann@1201
    13
 	   $(foreach lib,$(libof-$(basename $(@F))) \
yann@1201
    14
 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
yann@1201
    15
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
yann@1201
    16
+CPPFLAGS += $(CPPFLAGS-config)
yann@1201
    17
 override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
yann@1201
    18
 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
yann@1201
    19
 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
yann@1201
    20
diff -durN glibc-2_9.orig/config.make.in glibc-2_9/config.make.in
yann@1201
    21
--- glibc-2_9.orig/config.make.in	2008-08-18 11:42:17.000000000 +0200
yann@1201
    22
+++ glibc-2_9/config.make.in	2009-02-02 22:00:35.000000000 +0100
yann@1201
    23
@@ -97,6 +97,7 @@
yann@1201
    24
 CXX = @CXX@
yann@1201
    25
 BUILD_CC = @BUILD_CC@
yann@1201
    26
 CFLAGS = @CFLAGS@
yann@1201
    27
+CPPFLAGS-config = @CPPFLAGS@
yann@1201
    28
 ASFLAGS-config = @ASFLAGS_config@
yann@1201
    29
 AR = @AR@
yann@1201
    30
 RANLIB = @RANLIB@