patches/glibc/ports-2.10.1/100-respect-env-CPPFLAGS.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
[Yann E. MORIN: fix a comment, rephrase the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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@