From 7325781e35d488ec9b1dea9e8af3ea68e5f0cfcd Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 27 Jul 2010 00:11:26 -0700 Subject: [PATCH] gcc-4.5.0: apply the lib64 path 64bithack.patch Bump the PR for all the affected recipes Signed-off-by: Nitin A Kamble --- meta/packages/gcc/gcc-4.5.0.inc | 3 +-- meta/packages/gcc/gcc-4.5.0/64bithack.patch | 20 +++++++++++++++++++ meta/packages/gcc/gcc-cross-canadian_4.5.0.bb | 2 +- meta/packages/gcc/gcc-cross-initial_4.5.0.bb | 2 +- .../gcc/gcc-cross-intermediate_4.5.0.bb | 2 +- meta/packages/gcc/gcc-cross_4.5.0.bb | 2 +- .../gcc/gcc-crosssdk-initial_4.5.0.bb | 2 ++ .../gcc/gcc-crosssdk-intermediate_4.5.0.bb | 3 ++- meta/packages/gcc/gcc-crosssdk_4.5.0.bb | 2 ++ meta/packages/gcc/gcc-runtime_4.5.0.bb | 2 +- meta/packages/gcc/gcc_4.5.0.bb | 2 +- 11 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 meta/packages/gcc/gcc-4.5.0/64bithack.patch diff --git a/meta/packages/gcc/gcc-4.5.0.inc b/meta/packages/gcc/gcc-4.5.0.inc index ebf5e17ae9..9d66940bf9 100644 --- a/meta/packages/gcc/gcc-4.5.0.inc +++ b/meta/packages/gcc/gcc-4.5.0.inc @@ -4,8 +4,6 @@ LICENSE = "GPLv3" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native" -PR = "r0" - SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-4.5.0_to_svn_162398.patch.bz2 \ file://gcc_revert_base_version_to_4.5.0.patch \ @@ -46,6 +44,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://zecke-xgcc-cpp.patch \ file://gcc-poison-system-directories.patch \ file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ + file://64bithack.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/meta/packages/gcc/gcc-4.5.0/64bithack.patch b/meta/packages/gcc/gcc-4.5.0/64bithack.patch new file mode 100644 index 0000000000..ac65e01afa --- /dev/null +++ b/meta/packages/gcc/gcc-4.5.0/64bithack.patch @@ -0,0 +1,20 @@ +By default gcc places 64 bit libs in a lib64 directory. This makes it use +"lib" instead. + +RP 25/7/10 + +Index: gcc-4.3.3/gcc/config/i386/t-linux64 +=================================================================== +--- gcc-4.3.3.orig/gcc/config/i386/t-linux64 2010-07-25 12:26:36.000000000 +0100 ++++ gcc-4.3.3/gcc/config/i386/t-linux64 2010-07-25 13:43:02.000000000 +0100 +@@ -12,8 +12,8 @@ + # MULTILIB_OSDIRNAMES according to what is found on the target. + + MULTILIB_OPTIONS = m64/m32 +-MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_DIRNAMES = . 32 ++MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb b/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb index e160aab8a2..98e239d92c 100644 --- a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb +++ b/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r0" +PR = "r1" DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" diff --git a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb b/meta/packages/gcc/gcc-cross-initial_4.5.0.bb index e3aea8b356..a121782233 100644 --- a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb +++ b/meta/packages/gcc/gcc-cross-initial_4.5.0.bb @@ -1,5 +1,5 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -PR = "r0" +PR = "r1" diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb b/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb index 4cabe0eb4b..7aaa5b0512 100644 --- a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb +++ b/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -PR = "r0" +PR = "r1" diff --git a/meta/packages/gcc/gcc-cross_4.5.0.bb b/meta/packages/gcc/gcc-cross_4.5.0.bb index 7dab2b1277..148d304fe5 100644 --- a/meta/packages/gcc/gcc-cross_4.5.0.bb +++ b/meta/packages/gcc/gcc-cross_4.5.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb index 0c9fdd3449..0fc5faab3e 100644 --- a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb @@ -1,2 +1,4 @@ require gcc-cross-initial_${PV}.bb require gcc-crosssdk-initial.inc + +PR = "r1" diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb index d6e7c62847..4260c358ad 100644 --- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb @@ -1,3 +1,4 @@ require gcc-cross-intermediate_${PV}.bb require gcc-crosssdk-intermediate.inc -PR = "r0" + +PR = "r1" diff --git a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb index 7430888ed7..a23a66258a 100644 --- a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb @@ -1,2 +1,4 @@ require gcc-cross_${PV}.bb require gcc-crosssdk.inc + +PR = "r1" diff --git a/meta/packages/gcc/gcc-runtime_4.5.0.bb b/meta/packages/gcc/gcc-runtime_4.5.0.bb index 4d2302d35b..ca22e8be38 100644 --- a/meta/packages/gcc/gcc-runtime_4.5.0.bb +++ b/meta/packages/gcc/gcc-runtime_4.5.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require gcc-${PV}.inc require gcc-configure-runtime.inc diff --git a/meta/packages/gcc/gcc_4.5.0.bb b/meta/packages/gcc/gcc_4.5.0.bb index 0e7772534b..43bceb44c4 100644 --- a/meta/packages/gcc/gcc_4.5.0.bb +++ b/meta/packages/gcc/gcc_4.5.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require gcc-${PV}.inc require gcc-configure-target.inc