patches/glibc/2.9/110-respect-env-CPPFLAGS.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
parent 1201 c9967a6e3b25
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate.
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@