[oe-commits] Tom Rini : canadian sdk: Rework gcc-canadian-sdk include files to match the rest of the gcc family.
GIT User account
git at amethyst.openembedded.net
Tue Dec 23 04:19:54 UTC 2008
Module: openembedded.git
Branch: trini/canadian-sdk
Commit: 203217205c2b86cbf3e371fa795afe85b58d0c0f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=203217205c2b86cbf3e371fa795afe85b58d0c0f
Author: Tom Rini <trini at embeddedalley.com>
Date: Mon Dec 22 23:18:04 2008 -0500
canadian sdk: Rework gcc-canadian-sdk include files to match the rest of the gcc family.
Part of this is updating the overall gcc-package-sdk.inc file to pass in
prefix as well to the install target as canadian SDKs need this and it doesn't
harm regular.
---
packages/gcc/gcc-canadian-sdk-package.inc | 36 ------------------
packages/gcc/gcc-canadian-sdk_4.2.2.bb | 25 ++++++-------
...dk-build.inc => gcc-configure-canadian-sdk.inc} | 2 +
packages/gcc/gcc-package-canadian-sdk.inc | 39 ++++++++++++++++++++
packages/gcc/gcc-package-sdk.inc | 3 +-
5 files changed, 54 insertions(+), 51 deletions(-)
diff --git a/packages/gcc/gcc-canadian-sdk-package.inc b/packages/gcc/gcc-canadian-sdk-package.inc
deleted file mode 100644
index 5889821..0000000
--- a/packages/gcc/gcc-canadian-sdk-package.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-# Packages emitted by our gcc-cross builds.
-#
-INHIBIT_PACKAGE_STRIP ?= ""
-OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
-INHIBIT_PACKAGE_STRIP = "1"
-
-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)
-}
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' 'prefix=${SDK_PATH}' install
-
- # Manually run the target stripper since we won't get it run by
- # the packaging.
- if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
- ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libstdc++.so.*
- ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libg2c.so.* || true
- ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.*
- fi
-}
-
-FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*"
-FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so"
-
-FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*"
-FILES_libstdc++-dev = "${prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \
- ${prefix}/${TARGET_SYS}/lib/libstdc++.so \
- ${prefix}/${TARGET_SYS}/lib/libstdc++.a \
- ${prefix}/${TARGET_SYS}/lib/libsupc++.a"
-
-FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*"
-FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \
- ${prefix}/${TARGET_SYS}/lib/libmudflap*.a"
diff --git a/packages/gcc/gcc-canadian-sdk_4.2.2.bb b/packages/gcc/gcc-canadian-sdk_4.2.2.bb
index 61b2e10..3a5bd4d 100644
--- a/packages/gcc/gcc-canadian-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-canadian-sdk_4.2.2.bb
@@ -1,29 +1,28 @@
inherit canadian-sdk
-DEPENDS="\
- virtual/${HOST_PREFIX}binutils \
- virtual/${HOST_PREFIX}gcc \
- virtual/${TARGET_PREFIX}binutils \
- virtual/${TARGET_PREFIX}gcc \
- virtual/${TARGET_PREFIX}libc-for-gcc \
- gmp-native mpfr-native \
-"
+PR = "r1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
PACKAGES = "${PN}"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
+
+# Correct gmp / mpfr
+DEPENDS = "gmp-canadian mpfr-canadian"
+
+require gcc-configure-canadian-sdk.inc
+require gcc-package-canadian-sdk.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
-DEPENDS += "gmp-canadian mpfr-canadian"
SRC_URI_append =+ "\
file://canadian-build-modules-configure.patch;patch=1 \
"
-require gcc-canadian-sdk-build.inc
-require gcc-canadian-sdk-package.inc
-
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
--disable-libgomp --disable-libmudflap \
--with-mpfr=${STAGING_LIBDIR}"
diff --git a/packages/gcc/gcc-canadian-sdk-build.inc b/packages/gcc/gcc-configure-canadian-sdk.inc
similarity index 98%
rename from packages/gcc/gcc-canadian-sdk-build.inc
rename to packages/gcc/gcc-configure-canadian-sdk.inc
index 75ef6ca..489cb46 100644
--- a/packages/gcc/gcc-canadian-sdk-build.inc
+++ b/packages/gcc/gcc-configure-canadian-sdk.inc
@@ -1,3 +1,5 @@
+require gcc-configure-common.inc
+
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
diff --git a/packages/gcc/gcc-package-canadian-sdk.inc b/packages/gcc/gcc-package-canadian-sdk.inc
new file mode 100644
index 0000000..dff53cd
--- /dev/null
+++ b/packages/gcc/gcc-package-canadian-sdk.inc
@@ -0,0 +1,39 @@
+require gcc-package-sdk.inc
+
+PACKAGES += "libgcc libgcc-dev libgfortran-dev libmudflap libmudflap-dev"
+
+FILES_libgcc = "${libdir}/libgcc*.so.*"
+FILES_libgcc-dev = "${libdir}/libgcc*.so"
+
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++-dev = "\
+ ${incluedir}/c++/${BINV} \
+ ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++.a \
+ ${libdir}/libsupc++.la \
+ ${libdir}/libsupc++.a \
+"
+
+FILES_libgfortran-dev = "${libdir}/libgfortran.a \
+ ${libdir}/libgfortran.so \
+ ${libdir}/libgfortranbegin.a"
+
+FILES_libmudflap = "${libdir}/libmudflap*.so.*"
+FILES_libmudflap-dev = "\
+ ${libdir}/libmudflap*.so \
+ ${libdir}/libmudflap*.a \
+ ${libdir}/libmudflap*.a \
+"
+
+# Packages emitted by our gcc-cross builds.
+#
+INHIBIT_PACKAGE_STRIP ?= ""
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
+INHIBIT_PACKAGE_STRIP = "1"
+
+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)
+}
diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index 59fbc34..538aa06 100644
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -29,7 +29,7 @@ FILES_${PN}-doc = "\
"
do_install () {
- oe_runmake 'DESTDIR=${D}' install
+ oe_runmake 'DESTDIR=${D}' 'prefix=${SDK_PATH}' install
# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
@@ -60,4 +60,3 @@ do_install () {
${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.*
fi
}
-
More information about the Openembedded-commits
mailing list