[oe-commits] org.oe.dev gcc 4.x.x ship cc1 as part of the cpp package. closes #670
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Feb 20 17:05:49 UTC 2008
gcc 4.x.x ship cc1 as part of the cpp package. closes #670
repair badly mixed up formatting. guys, _please_ don't mix tabs and spaces,
stick to the major formatting style in the file
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9a694dbde6dd96803bccae08f8e83850e03f2b58
ViewMTN: http://monotone.openembedded.org/revision/info/9a694dbde6dd96803bccae08f8e83850e03f2b58
Files:
1
packages/gcc/gcc-package.inc
packages/gcc/gcc_4.0.0.bb
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.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
Diffs:
#
# mt diff -r777103e5b5aa7d64334c2a82ce75fa5e033379db -r9a694dbde6dd96803bccae08f8e83850e03f2b58
#
#
#
# patch "packages/gcc/gcc-package.inc"
# from [29d6e860f56905f8f155890e57612975fabd4f9b]
# to [e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9]
#
# patch "packages/gcc/gcc_4.0.0.bb"
# from [a8f79504565dce0ccceb3bced8c8c874caf13f5e]
# to [1ea907e9cf461db082a95d72498f977bf9cdf397]
#
# patch "packages/gcc/gcc_4.0.2.bb"
# from [0156b0ed1e59ed7e6319931b8637568457eb1a94]
# to [7b32baa6265a8baeaa95db1f20ef4d3c86499268]
#
# patch "packages/gcc/gcc_4.1.0.bb"
# from [969b03f6753406d3c1fc57118391e227359539c8]
# to [79e5d5565f0a8d820e94e5287f3e4fdd6741d6c6]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [ba26064f61c07690d6fc9e80c2083fa783cec5ff]
# to [3714a3e209cfe79de017247adf48c493d22a9f82]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [e59d3a8f06eb5ab8da6c507b3194bde070178cbf]
# to [c44d2580c2ecb17e4aa49c880767ad3078997206]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [8af26a60d2ad4ac377a3cb771aae9e6d395bfa58]
# to [24b156595e4214b3b525a3cb63450d3e9798bc1c]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [e3cc18f11ea8954870f79c7a095814c2a298871d]
# to [71f991a05f98b5c132567ed6c4ab496016222a4f]
#
============================================================
--- packages/gcc/gcc-package.inc 29d6e860f56905f8f155890e57612975fabd4f9b
+++ packages/gcc/gcc-package.inc e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9
@@ -1,45 +1,58 @@ BINV ?= "${PV}"
gcclibdir ?= "${libdir}/gcc"
BINV ?= "${PV}"
-PACKAGES = "libgcc ${PN} ${PN}-symlinks \
- g++ g++-symlinks \
- cpp cpp-symlinks \
- g77 g77-symlinks \
- gfortran gfortran-symlinks \
- gcov gcov-symlinks \
- libmudflap libmudflap-dev \
- libstdc++ libg2c \
- libstdc++-dev libg2c-dev \
- ${PN}-doc"
+PACKAGES = "\
+ libgcc ${PN} ${PN}-symlinks \
+ g++ g++-symlinks \
+ cpp cpp-symlinks \
+ g77 g77-symlinks \
+ gfortran gfortran-symlinks \
+ gcov gcov-symlinks \
+ libmudflap libmudflap-dev \
+ libstdc++ libg2c \
+ libstdc++-dev libg2c-dev \
+ ${PN}-doc \
+"
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
- ${bindir}/${TARGET_PREFIX}gccbug \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
-FILES_${PN}-symlinks = "${bindir}/cc \
- ${bindir}/gcc \
- ${bindir}/gccbug"
+FILES_${PN} = "\
+ ${bindir}/${TARGET_PREFIX}gcc \
+ ${bindir}/${TARGET_PREFIX}gccbug \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+"
+FILES_${PN}-symlinks = "\
+ ${bindir}/cc \
+ ${bindir}/gcc \
+ ${bindir}/gccbug \
+"
-FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
-FILES_g77-symlinks = "${bindir}/g77 \
- ${bindir}/f77"
+FILES_g77 = "\
+ ${bindir}/${TARGET_PREFIX}g77 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+FILES_g77-symlinks = "\
+ ${bindir}/g77 \
+ ${bindir}/f77 \
+"
+FILES_gfortran = "\
+ ${bindir}/${TARGET_PREFIX}gfortran \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
+"
+FILES_gfortran-symlinks = "\
+ ${bindir}/gfortran \
+ ${bindir}/f95"
-FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
-FILES_gfortran-symlinks = "${bindir}/gfortran \
- ${bindir}/f95"
-
-FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
- ${base_libdir}/cpp"
+FILES_cpp = "\
+ ${bindir}/${TARGET_PREFIX}cpp \
+ ${base_libdir}/cpp \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
FILES_cpp-symlinks = "${bindir}/cpp"
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
@@ -50,37 +63,48 @@ FILES_libg2c = "${target_libdir}/libg2c.
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
-FILES_libg2c-dev = "${libdir}/libg2c.so \
- ${libdir}/libg2c.a \
- ${libdir}/libfrtbegin.a"
+FILES_libg2c-dev = "\
+ ${libdir}/libg2c.so \
+ ${libdir}/libg2c.a \
+ ${libdir}/libfrtbegin.a \
+"
-FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
-FILES_g++-symlinks = "${bindir}/c++ \
- ${bindir}/g++"
+FILES_g++ = "\
+ ${bindir}/${TARGET_PREFIX}g++ \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES_g++-symlinks = "\
+ ${bindir}/c++ \
+ ${bindir}/g++ \
+"
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
- ${libdir}/libstdc++.so \
- ${libdir}/libstdc++.la \
- ${libdir}/libstdc++.a \
- ${libdir}/libsupc++.la \
- ${libdir}/libsupc++.a"
+FILES_libstdc++-dev = "\
+ ${includedir}/c++/${BINV} \
+ ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++.a \
+ ${libdir}/libsupc++.la \
+ ${libdir}/libsupc++.a \
+"
FILES_libmudflap = "${libdir}/libmudflap*.so.*"
-FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
- ${libdir}/libmudflap*.a \
- ${libdir}/libmudflap*.a"
+FILES_libmudflap-dev = "\
+ ${libdir}/libmudflap*.so \
+ ${libdir}/libmudflap*.a \
+ ${libdir}/libmudflap*.a \
+"
+FILES_${PN}-doc = "\
+ ${infodir} \
+ ${mandir} \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
-FILES_${PN}-doc = "${infodir} \
- ${mandir} \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
-
python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libgcc', 'libgcc1', d)
- bb.build.exec_func('package_do_package', d)
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+ bb.build.exec_func('package_do_package', d)
}
============================================================
--- packages/gcc/gcc_4.0.0.bb a8f79504565dce0ccceb3bced8c8c874caf13f5e
+++ packages/gcc/gcc_4.0.0.bb 1ea907e9cf461db082a95d72498f977bf9cdf397
@@ -1,8 +1,8 @@
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.0.2.bb 0156b0ed1e59ed7e6319931b8637568457eb1a94
+++ packages/gcc/gcc_4.0.2.bb 7b32baa6265a8baeaa95db1f20ef4d3c86499268
@@ -1,9 +1,9 @@ DEPENDS = "mpfr gmp"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
DEPENDS = "mpfr gmp"
-PR = "r6"
+PR = "r7"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.0.bb 969b03f6753406d3c1fc57118391e227359539c8
+++ packages/gcc/gcc_4.1.0.bb 79e5d5565f0a8d820e94e5287f3e4fdd6741d6c6
@@ -1,8 +1,9 @@
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
+
DEFAULT_PREFERENCE = "-1"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.1.bb ba26064f61c07690d6fc9e80c2083fa783cec5ff
+++ packages/gcc/gcc_4.1.1.bb 3714a3e209cfe79de017247adf48c493d22a9f82
@@ -1,8 +1,8 @@
-PR = "r17"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r18"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.2.bb e59d3a8f06eb5ab8da6c507b3194bde070178cbf
+++ packages/gcc/gcc_4.1.2.bb c44d2580c2ecb17e4aa49c880767ad3078997206
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment the -cross .bb PR too.
-PR = "r10"
+PR = "r11"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.2.1.bb 8af26a60d2ad4ac377a3cb771aae9e6d395bfa58
+++ packages/gcc/gcc_4.2.1.bb 24b156595e4214b3b525a3cb63450d3e9798bc1c
@@ -1,8 +1,8 @@
-PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r8"
inherit autotools gettext
@@ -11,8 +11,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://904-flatten-switch-stmt-00.patch;patch=1 \
@@ -36,10 +36,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://gfortran.patch;patch=1 \
- file://pr34130.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
"
SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
============================================================
--- packages/gcc/gcc_4.2.2.bb e3cc18f11ea8954870f79c7a095814c2a298871d
+++ packages/gcc/gcc_4.2.2.bb 71f991a05f98b5c132567ed6c4ab496016222a4f
@@ -1,8 +1,8 @@
-PR = "r3"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r4"
inherit autotools gettext
@@ -11,8 +11,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://801-arm-bigendian-eabi.patch;patch=1 \
@@ -37,12 +37,12 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://gfortran.patch;patch=1 \
- file://gcc-4.0.2-e300c2c3.patch;patch=1 \
- file://pr34130.patch;patch=1 \
- file://fortran-static-linking.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
+ file://fortran-static-linking.patch;patch=1 \
"
SRC_URI_append_ep93xx = " \
More information about the Openembedded-commits
mailing list