gcc-4.5.0: apply the lib64 path 64bithack.patch
Bump the PR for all the affected recipes Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
parent
067863d38d
commit
7325781e35
|
@ -4,8 +4,6 @@ LICENSE = "GPLv3"
|
||||||
DEPENDS =+ "mpfr gmp libmpc elfutils"
|
DEPENDS =+ "mpfr gmp libmpc elfutils"
|
||||||
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
|
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
|
||||||
|
|
||||||
PR = "r0"
|
|
||||||
|
|
||||||
SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
|
SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
|
||||||
file://gcc-4.5.0_to_svn_162398.patch.bz2 \
|
file://gcc-4.5.0_to_svn_162398.patch.bz2 \
|
||||||
file://gcc_revert_base_version_to_4.5.0.patch \
|
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://zecke-xgcc-cpp.patch \
|
||||||
file://gcc-poison-system-directories.patch \
|
file://gcc-poison-system-directories.patch \
|
||||||
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.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 "
|
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
|
||||||
|
|
|
@ -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
|
|
@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
|
||||||
require gcc-configure-sdk.inc
|
require gcc-configure-sdk.inc
|
||||||
require gcc-package-sdk.inc
|
require gcc-package-sdk.inc
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
||||||
RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-initial.inc
|
require gcc-cross-initial.inc
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-intermediate.inc
|
require gcc-cross-intermediate.inc
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-cross4.inc
|
require gcc-cross4.inc
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
require gcc-cross-initial_${PV}.bb
|
require gcc-cross-initial_${PV}.bb
|
||||||
require gcc-crosssdk-initial.inc
|
require gcc-crosssdk-initial.inc
|
||||||
|
|
||||||
|
PR = "r1"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
require gcc-cross-intermediate_${PV}.bb
|
require gcc-cross-intermediate_${PV}.bb
|
||||||
require gcc-crosssdk-intermediate.inc
|
require gcc-crosssdk-intermediate.inc
|
||||||
PR = "r0"
|
|
||||||
|
PR = "r1"
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-crosssdk.inc
|
require gcc-crosssdk.inc
|
||||||
|
|
||||||
|
PR = "r1"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-runtime.inc
|
require gcc-configure-runtime.inc
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-target.inc
|
require gcc-configure-target.inc
|
||||||
|
|
Loading…
Reference in New Issue