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