[oe-commits] org.oe.packaged-staging gcc: sync with .dev s/include/require and add missing files
rpurdie commit
openembedded-commits at lists.openembedded.org
Fri Sep 29 03:32:31 UTC 2006
gcc: sync with .dev s/include/require and add missing files
Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: 62203846b784ed14258633ec8fb6d75d80228407
ViewMTN: http://monotone.openembedded.org/revision.psp?id=62203846b784ed14258633ec8fb6d75d80228407
Files:
1
packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
packages/gcc/gcc-cross_4.1-20060217.bb
packages/gcc/gcc_4.1-20060217.bb
packages/gcc/gcc-cross-initial_4.0.2.bb
packages/gcc/gcc-cross-initial_4.1-20060217.bb
packages/gcc/gcc-cross-initial_4.1.0.bb
packages/gcc/gcc-cross-initial_4.1.1.bb
packages/gcc/gcc-cross_4.0.2.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.2-20060513.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc3-build-cross.inc
packages/gcc/gcc4-build.inc
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.2-20060513.bb
Diffs:
#
# mt diff -r432a3e0c4077a339ca2380361849973271250193 -r62203846b784ed14258633ec8fb6d75d80228407
#
#
#
# add_file "packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch"
# content [e068fcfb82636628eb185cd67fa8482292342608]
#
# add_file "packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch"
# content [3e9beaf5a1b697fb60408fa6515cb4f6f14a5088]
#
# add_file "packages/gcc/gcc-cross_4.1-20060217.bb"
# content [20d8571c6fdba17bdade2025692e5a7bd53978e9]
#
# add_file "packages/gcc/gcc_4.1-20060217.bb"
# content [5bb1d2e25583ad8830225fa083cf8e23843ad213]
#
# patch "packages/gcc/gcc-cross-initial_4.0.2.bb"
# from [92df00442d5c10d18c22086872e1973192c057ff]
# to [a37774895cdec33f177e79d7d20efb8bb3a93385]
#
# patch "packages/gcc/gcc-cross-initial_4.1-20060217.bb"
# from [92df00442d5c10d18c22086872e1973192c057ff]
# to [a37774895cdec33f177e79d7d20efb8bb3a93385]
#
# patch "packages/gcc/gcc-cross-initial_4.1.0.bb"
# from [4abaa1392a055c07a1d302c1351dfe7ed4a15427]
# to [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
#
# patch "packages/gcc/gcc-cross-initial_4.1.1.bb"
# from [4abaa1392a055c07a1d302c1351dfe7ed4a15427]
# to [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
#
# patch "packages/gcc/gcc-cross_4.0.2.bb"
# from [c6b60e68163b88202c1308008ee38ca23c56ae18]
# to [20d8571c6fdba17bdade2025692e5a7bd53978e9]
#
# patch "packages/gcc/gcc-cross_4.1.0.bb"
# from [8406935ac8f6a459161b600e44056ecfaf9916f7]
# to [916fc24a922221b419d60b6151d0ae0c5be5caa4]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [de809d4b9523aa71393e67e0db8786823f0193a7]
# to [3b76634443a4c689418e528e942a152555f78ffb]
#
# patch "packages/gcc/gcc-cross_4.2-20060513.bb"
# from [8406935ac8f6a459161b600e44056ecfaf9916f7]
# to [916fc24a922221b419d60b6151d0ae0c5be5caa4]
#
# patch "packages/gcc/gcc-package-cross.inc"
# from [847463f10c80ae4d78d85767235c4e0c4ea5e44b]
# to [49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee]
#
# patch "packages/gcc/gcc3-build-cross.inc"
# from [d9c4e6a1d11e9149fb0678feed1de1dbb89dda1e]
# to [91f7b45c16557e427be4b7de039ed566f3e1463c]
#
# patch "packages/gcc/gcc4-build.inc"
# from [50f3b416ea9c1d60536fbf9cab6c5aa6dd60f99d]
# to [724b5fa1e5771686d8f92b83f4a4c6a67fb05d0c]
#
# patch "packages/gcc/gcc_4.0.2.bb"
# from [fc1811f11485dcc8f3f8208875bb71c43af68860]
# to [ad52066aa2a0bcaf67a619ec608a3f3b30519d4b]
#
# patch "packages/gcc/gcc_4.1.0.bb"
# from [8ca3e6944880d8dd9ec5ccf25ab7c390b02a6455]
# to [ade8f25ea6baf09fb1a3fb08d8a5383c91f259d9]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [864cb374d9e3c1f673ff025d3855d50feb1f93ce]
# to [f62161c1508592352905c08473edc664cf80fac9]
#
# patch "packages/gcc/gcc_4.2-20060513.bb"
# from [e4f563bc38763fd71a5210541730303b767600e6]
# to [0efa26aedbb2c4fb5b51f2113b56b16649c10c19]
#
============================================================
--- packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch e068fcfb82636628eb185cd67fa8482292342608
+++ packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch e068fcfb82636628eb185cd67fa8482292342608
@@ -0,0 +1,12 @@
+Index: gcc-4.1.0/Makefile.in
+===================================================================
+--- gcc-4.1.0.orig/Makefile.in 2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1.0/Makefile.in 2006-08-06 13:29:36.000000000 +0200
+@@ -194,6 +194,7 @@
+ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ CC="$(CC_FOR_TARGET)"; export CC; \
+ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
============================================================
--- packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch 3e9beaf5a1b697fb60408fa6515cb4f6f14a5088
+++ packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch 3e9beaf5a1b697fb60408fa6515cb4f6f14a5088
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in 2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in 2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ AS="$(AS_FOR_TARGET)"; export AS; \
+ CC="$(CC_FOR_TARGET)"; export CC; \
+ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
============================================================
--- packages/gcc/gcc-cross_4.1-20060217.bb 20d8571c6fdba17bdade2025692e5a7bd53978e9
+++ packages/gcc/gcc-cross_4.1-20060217.bb 20d8571c6fdba17bdade2025692e5a7bd53978e9
@@ -0,0 +1,16 @@
+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"
+
+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-package-cross.inc
============================================================
--- packages/gcc/gcc_4.1-20060217.bb 5bb1d2e25583ad8830225fa083cf8e23843ad213
+++ packages/gcc/gcc_4.1-20060217.bb 5bb1d2e25583ad8830225fa083cf8e23843ad213
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+DEFAULT_PREFERENCE = "-99999"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \
+ file://arm-nolibfloat.patch;patch=1 \
+ file://arm-softfloat.patch;patch=1 \
+ file://zecke-xgcc-cpp.patch;patch=1 \
+ file://ldflags.patch;patch=1"
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+require gcc4-build.inc
============================================================
--- packages/gcc/gcc-cross-initial_4.0.2.bb 92df00442d5c10d18c22086872e1973192c057ff
+++ packages/gcc/gcc-cross-initial_4.0.2.bb a37774895cdec33f177e79d7d20efb8bb3a93385
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
============================================================
--- packages/gcc/gcc-cross-initial_4.1-20060217.bb 92df00442d5c10d18c22086872e1973192c057ff
+++ packages/gcc/gcc-cross-initial_4.1-20060217.bb a37774895cdec33f177e79d7d20efb8bb3a93385
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
============================================================
--- packages/gcc/gcc-cross-initial_4.1.0.bb 4abaa1392a055c07a1d302c1351dfe7ed4a15427
+++ packages/gcc/gcc-cross-initial_4.1.0.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
============================================================
--- packages/gcc/gcc-cross-initial_4.1.1.bb 4abaa1392a055c07a1d302c1351dfe7ed4a15427
+++ packages/gcc/gcc-cross-initial_4.1.1.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
============================================================
--- packages/gcc/gcc-cross_4.0.2.bb c6b60e68163b88202c1308008ee38ca23c56ae18
+++ packages/gcc/gcc-cross_4.0.2.bb 20d8571c6fdba17bdade2025692e5a7bd53978e9
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+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*
@@ -11,6 +11,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
# cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
# cross packaging
+require gcc-package-cross.inc
-include gcc-package-cross.inc
============================================================
--- packages/gcc/gcc-cross_4.1.0.bb 8406935ac8f6a459161b600e44056ecfaf9916f7
+++ packages/gcc/gcc-cross_4.1.0.bb 916fc24a922221b419d60b6151d0ae0c5be5caa4
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+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*
@@ -11,8 +11,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
# cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
# cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb de809d4b9523aa71393e67e0db8786823f0193a7
+++ packages/gcc/gcc-cross_4.1.1.bb 3b76634443a4c689418e528e942a152555f78ffb
@@ -1,18 +1,18 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+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 = "r2"
+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
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
# cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.2-20060513.bb 8406935ac8f6a459161b600e44056ecfaf9916f7
+++ packages/gcc/gcc-cross_4.2-20060513.bb 916fc24a922221b419d60b6151d0ae0c5be5caa4
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+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*
@@ -11,8 +11,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
# cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
# cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-package-cross.inc 847463f10c80ae4d78d85767235c4e0c4ea5e44b
+++ packages/gcc/gcc-package-cross.inc 49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee
@@ -7,6 +7,7 @@ PACKAGES = "libgcc libstdc++ libg2c libg
INHIBIT_PACKAGE_STRIP = "1"
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
+PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
============================================================
--- packages/gcc/gcc3-build-cross.inc d9c4e6a1d11e9149fb0678feed1de1dbb89dda1e
+++ packages/gcc/gcc3-build-cross.inc 91f7b45c16557e427be4b7de039ed566f3e1463c
@@ -21,10 +21,6 @@ do_stage_append () {
rm -rf ${CROSS_DIR}/$d
done
- # These aren't useful on the cross toolchain
- rm -f ${CROSS_DIR}/bin/*gcov
- rm -f ${CROSS_DIR}/bin/*gccbug
-
# Fix a few include links so cross builds are happier
if [ ! -e ${STAGING_INCDIR}/c++ ]; then
mkdir -p ${STAGING_INCDIR}
============================================================
--- packages/gcc/gcc4-build.inc 50f3b416ea9c1d60536fbf9cab6c5aa6dd60f99d
+++ packages/gcc/gcc4-build.inc 724b5fa1e5771686d8f92b83f4a4c6a67fb05d0c
@@ -1,5 +1,5 @@
-FORTRAN = "f95"
-HAS_GFORTRAN = "yes"
+FORTRAN = ",f95"
+HAS_GFORTRAN ?= "yes"
HAS_G2C = "no"
include gcc3-build.inc
============================================================
--- packages/gcc/gcc_4.0.2.bb fc1811f11485dcc8f3f8208875bb71c43af68860
+++ packages/gcc/gcc_4.0.2.bb ad52066aa2a0bcaf67a619ec608a3f3b30519d4b
@@ -7,7 +7,7 @@ inherit autotools gettext
inherit autotools gettext
-include gcc-package.inc
+require gcc-package.inc
SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://arm-nolibfloat.patch;patch=1 \
@@ -26,7 +26,7 @@ SRC_URI_append_fail-fast = " file://zeck
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-include gcc4-build.inc
+require gcc4-build.inc
EXTRA_OECONF += "--disable-libssp"
============================================================
--- packages/gcc/gcc_4.1.0.bb 8ca3e6944880d8dd9ec5ccf25ab7c390b02a6455
+++ packages/gcc/gcc_4.1.0.bb ade8f25ea6baf09fb1a3fb08d8a5383c91f259d9
@@ -7,7 +7,7 @@ inherit autotools gettext
inherit autotools gettext
-include gcc-package.inc
+require gcc-package.inc
SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI_append_fail-fast = " file://zeck
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-include gcc4-build.inc
+require gcc4-build.inc
EXTRA_OECONF += "--disable-libssp"
FORTRAN = ""
============================================================
--- packages/gcc/gcc_4.1.1.bb 864cb374d9e3c1f673ff025d3855d50feb1f93ce
+++ packages/gcc/gcc_4.1.1.bb f62161c1508592352905c08473edc664cf80fac9
@@ -7,7 +7,7 @@ inherit autotools gettext
inherit autotools gettext
-include gcc-package.inc
+require gcc-package.inc
SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI_append_fail-fast = " file://zeck
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-include gcc4-build.inc
+require gcc4-build.inc
EXTRA_OECONF += "--disable-libssp"
FORTRAN = ""
============================================================
--- packages/gcc/gcc_4.2-20060513.bb e4f563bc38763fd71a5210541730303b767600e6
+++ packages/gcc/gcc_4.2-20060513.bb 0efa26aedbb2c4fb5b51f2113b56b16649c10c19
@@ -7,7 +7,7 @@ inherit autotools gettext
inherit autotools gettext
-include gcc-package.inc
+require gcc-package.inc
SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
file://arm-nolibfloat.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI_append_fail-fast = " file://zeck
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-include gcc4-build.inc
+require gcc4-build.inc
EXTRA_OECONF += "--disable-libssp"
FORTRAN = ""
More information about the Openembedded-commits
mailing list