diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/gcc/gcc-cross-sdk.inc | 4 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross.inc | 12 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross4.inc | 3 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross_3.4.4.bb | 18 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross_4.0.2.bb | 18 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross_4.1.2.bb | 24 | ||||
-rw-r--r-- | meta/packages/gcc/gcc-cross_4.2.2.bb | 19 |
7 files changed, 43 insertions, 55 deletions
diff --git a/meta/packages/gcc/gcc-cross-sdk.inc b/meta/packages/gcc/gcc-cross-sdk.inc new file mode 100644 index 000000000..fb2434293 --- /dev/null +++ b/meta/packages/gcc/gcc-cross-sdk.inc @@ -0,0 +1,4 @@ +inherit sdk + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" + diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc new file mode 100644 index 000000000..3fa6f61f0 --- /dev/null +++ b/meta/packages/gcc/gcc-cross.inc @@ -0,0 +1,12 @@ +# Path mangling needed by the cross packaging +# Note that we use := here, and require that this is included at the correct +# point (before inheriting cross) to ensure that libdir and includedir are +# target paths, not CROSS_DIR paths. +target_libdir := "${libdir}" +target_includedir := "${includedir}" +target_base_libdir := "${base_libdir}" + +inherit cross + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/meta/packages/gcc/gcc-cross4.inc b/meta/packages/gcc/gcc-cross4.inc new file mode 100644 index 000000000..3d3403737 --- /dev/null +++ b/meta/packages/gcc/gcc-cross4.inc @@ -0,0 +1,3 @@ +require gcc-cross.inc + +DEPENDS += "gmp-native mpfr-native" diff --git a/meta/packages/gcc/gcc-cross_3.4.4.bb b/meta/packages/gcc/gcc-cross_3.4.4.bb index ef679365e..4d93346d8 100644 --- a/meta/packages/gcc/gcc-cross_3.4.4.bb +++ b/meta/packages/gcc/gcc-cross_3.4.4.bb @@ -1,16 +1,6 @@ -require gcc_${PV}.bb -# path mangling, needed by the cross packaging -require gcc-paths-cross.inc -inherit cross -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -# NOTE: split PR. If the main .oe changes something that affects its *build* -# remember to increment this one too. -PR = "r3" +PR = "r8" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" - -# cross build -require gcc3-build-cross.inc -# cross packaging +require gcc-${PV}.inc +require gcc-cross.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/meta/packages/gcc/gcc-cross_4.0.2.bb b/meta/packages/gcc/gcc-cross_4.0.2.bb index d2dc24012..c296a0323 100644 --- a/meta/packages/gcc/gcc-cross_4.0.2.bb +++ b/meta/packages/gcc/gcc-cross_4.0.2.bb @@ -1,16 +1,6 @@ -require gcc_${PV}.bb -# path mangling, needed by the cross packaging -require gcc-paths-cross.inc -inherit cross -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -# NOTE: split PR. If the main .oe changes something that affects its *build* -# remember to increment this one too. -PR = "r1" +PR = "r10" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" -PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" - -# cross build -require gcc3-build-cross.inc -# cross packaging +require gcc-${PV}.inc +require gcc-cross4.inc +require gcc-configure-cross.inc require gcc-package-cross.inc diff --git a/meta/packages/gcc/gcc-cross_4.1.2.bb b/meta/packages/gcc/gcc-cross_4.1.2.bb index 20b7016b9..a344bfcba 100644 --- a/meta/packages/gcc/gcc-cross_4.1.2.bb +++ b/meta/packages/gcc/gcc-cross_4.1.2.bb @@ -1,18 +1,14 @@ -require gcc_${PV}.bb -# path mangling, needed by the cross packaging -require gcc-paths-cross.inc -inherit cross -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -# NOTE: split PR. If the main .oe changes something that affects its *build* -# remember to increment this one too. -PR = "r5" +PR = "r14" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" -PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" - -# cross build -require gcc3-build-cross.inc -# cross packaging +require gcc-${PV}.inc +require gcc-cross4.inc +require gcc-configure-cross.inc require gcc-package-cross.inc +SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " + +EXTRA_OECONF_append_avr32= " --disable-libmudflap " + EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" diff --git a/meta/packages/gcc/gcc-cross_4.2.2.bb b/meta/packages/gcc/gcc-cross_4.2.2.bb index def16597e..8a7a21f18 100644 --- a/meta/packages/gcc/gcc-cross_4.2.2.bb +++ b/meta/packages/gcc/gcc-cross_4.2.2.bb @@ -1,22 +1,15 @@ -require gcc_${PV}.bb -# path mangling, needed by the cross packaging -require gcc-paths-cross.inc -inherit cross -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -# NOTE: split PR. If the main .oe changes something that affects its *build* -# remember to increment this one too. PR = "r6" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" -PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" - -# cross build -require gcc3-build-cross.inc -# cross packaging +require gcc-${PV}.inc +require gcc-cross4.inc +require gcc-configure-cross.inc require gcc-package-cross.inc + SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " # Do not build libssp libmudflap and libgomp # We might need them for some beefy targets EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" |