Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Fri Jul 29 13:04:49 2011 +0200 (2011-07-29)
changeset 2574 6e1412ba8da9
permissions -rw-r--r--
scripts/functions: force extract folder to archive basename

Some archives like those of the 2011.07 revisions of Linaro GCC contain a folder
name different from the archive basename, which leads to errors afterwards, e.g.
when patching. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 extracts to gcc-linaro-4.5-2011.07-0/

This patch changes CT_Extract() to force the extraction of all archives to a
folder named like the archive basename. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 now extracts to gcc-linaro-4.5-2011.07/

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> 
     1 Respect environment CPPFLAGS when we run ./configure so we can inject

     2 random -D things without having to set CFLAGS/ASFLAGS

     3 

     4 diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig

     5 --- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200

     6 +++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100

     7 @@ -697,6 +697,7 @@

     8  	   $(foreach lib,$(libof-$(basename $(@F))) \

     9  		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \

    10  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))

    11 +CPPFLAGS += $(CPPFLAGS-config)

    12  override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \

    13  		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \

    14  		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \

    15 diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in

    16 --- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200

    17 +++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100

    18 @@ -107,6 +107,7 @@

    19  CXX = @CXX@

    20  BUILD_CC = @BUILD_CC@

    21  CFLAGS = @CFLAGS@

    22 +CPPFLAGS-config = @CPPFLAGS@

    23  ASFLAGS-config = @ASFLAGS_config@

    24  AR = @AR@

    25  RANLIB = @RANLIB@
crosstool-ng