From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gate.crashing.org ([63.228.1.57] ident=[U2FsdGVkX185LZf2e/1P8r2s0fgIfFEf0j6I+42HzDE=]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QoNal-0001mY-0k for openembedded-core@lists.openembedded.org; Wed, 03 Aug 2011 00:37:39 +0200 Received: from localhost (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id p72MXHsM011117 for ; Tue, 2 Aug 2011 17:33:18 -0500 From: Kumar Gala To: openembedded-core@lists.openembedded.org Date: Tue, 2 Aug 2011 17:33:17 -0500 Message-Id: <1312324397-1923-1-git-send-email-galak@kernel.crashing.org> X-Mailer: git-send-email 1.5.6.5 Subject: [PATCH v2] gcc: Fix setting of GLIBC_DYNAMIC_LINKER X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 22:37:39 -0000 The sed regex in do_configure_prepend was producing the following result: #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "/lib64/ld-linux-x86-64.so.2" instead of removing the leading "/lib" or "/lib64". Now we have it do: #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" Additionally, with the regex fixed the manipulation of SYSTEMLIBS_DIR needs to be removed. Signed-off-by: Kumar Gala --- * cleanup regex so we dont add in / explicity but just pull it in from how SYSTEMLIBS_DIR is set. meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 12 ++++++++---- meta/recipes-devtools/gcc/gcc_4.5.1.bb | 2 +- meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index b054266..3a6f273 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r3" +PR = "r4" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index aac6d69..238496f 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -66,11 +66,15 @@ SYSTEMLIBS1 = "${target_libdir}/" do_configure_prepend () { # Change the default dynamic linker path, only useful for SDK, other's value # are not changed according to the SYSTEMLIBS_DIR + # + # We want something like the following: + # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + # becomes + # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" + # sed -i ${S}/gcc/config/*/linux*.h -e \ - 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#' + 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#' - SYSTEMLIBS_DIR=`dirname ${SYSTEMLIBS}` - [ "$SYSTEMLIBS_DIR" = "/" ] && SYSTEMLIBS_DIR="" # teach gcc to find correct target includedir when checking libc ssp support mkdir -p ${B}/gcc echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe @@ -85,7 +89,7 @@ do_configure_prepend () { #ifndef STANDARD_STARTFILE_PREFIX_2 #define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}" #endif -#define SYSTEMLIBS_DIR "$SYSTEMLIBS_DIR" +#define SYSTEMLIBS_DIR "${SYSTEMLIBS}" #endif /* ! GCC_DEFAULTS_H */ _EOF mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb index f036cb1..75901ba 100644 --- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc diff --git a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb index 9fd2b0a..1bbab50 100644 --- a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb +++ b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-configure-target.inc -- 1.7.3.4