diff options
| -rw-r--r-- | meta/packages/gcc/gcc-4.5.0.inc | 3 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch | 23 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross-canadian_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross-initial_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-crosssdk_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-runtime_4.5.0.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc_4.5.0.bb | 2 |
11 files changed, 34 insertions, 10 deletions
diff --git a/meta/packages/gcc/gcc-4.5.0.inc b/meta/packages/gcc/gcc-4.5.0.inc index a93b67bfed..6ca2f98bc8 100644 --- a/meta/packages/gcc/gcc-4.5.0.inc +++ b/meta/packages/gcc/gcc-4.5.0.inc @@ -45,7 +45,8 @@ 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 \ + file://64bithack.patch \ + file://optional_libstdc.patch \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch b/meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch new file mode 100644 index 0000000000..0f74353a1f --- /dev/null +++ b/meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch @@ -0,0 +1,23 @@ +gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ +will not run correctly since my default the linker will try and link against libstdc++ +which shouldn't exist yet. We need an option to disable the automatically added -lstdc++ +option whilst leaving -lc, -lgcc and other automatic library dependencies. This patch +adds such an option which only disables the -lstdc++ linkage. + +A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to +do this officially, the likely answer is don't build libstdc++ separately. + +RP 29/6/10 + +Index: gcc-4.3.3/gcc/cp/g++spec.c +=================================================================== +--- gcc-4.3.3.orig/gcc/cp/g++spec.c 2010-06-29 00:06:03.901695025 +0100 ++++ gcc-4.3.3/gcc/cp/g++spec.c 2010-06-29 00:06:58.800325439 +0100 +@@ -131,6 +131,7 @@ + if (argv[i][0] == '-') + { + if (strcmp (argv[i], "-nostdlib") == 0 ++ || strcmp (argv[i], "-nostdlib++") == 0 + || strcmp (argv[i], "-nodefaultlibs") == 0) + { + library = -1; 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 92708d44e7..f67a5a3795 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 = "r4" +PR = "r5" 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 081b7d60fb..28ac1abe18 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 = "r4" +PR = "r5" 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 9a30cb5119..a8473b0ebe 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 = "r4" +PR = "r5" diff --git a/meta/packages/gcc/gcc-cross_4.5.0.bb b/meta/packages/gcc/gcc-cross_4.5.0.bb index 04e4f8d212..3900c8b2ea 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 = "r4" +PR = "r5" 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 970824805f..57d1f6b7ea 100644 --- a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb @@ -1,4 +1,4 @@ require gcc-cross-initial_${PV}.bb require gcc-crosssdk-initial.inc -PR = "r4" +PR = "r5" 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 d235969591..57d1f4844a 100644 --- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb @@ -1,4 +1,4 @@ require gcc-cross-intermediate_${PV}.bb require gcc-crosssdk-intermediate.inc -PR = "r4" +PR = "r5" diff --git a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb index bae238970a..1f3f63d38c 100644 --- a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb +++ b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-crosssdk.inc -PR = "r4" +PR = "r5" diff --git a/meta/packages/gcc/gcc-runtime_4.5.0.bb b/meta/packages/gcc/gcc-runtime_4.5.0.bb index 9eb658b12c..2127eb687b 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 = "r4" +PR = "r5" 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 c14914cddb..a257ddc1de 100644 --- a/meta/packages/gcc/gcc_4.5.0.bb +++ b/meta/packages/gcc/gcc_4.5.0.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-configure-target.inc |