From efb7a4954e62730b8dc077c429f9a9043111f82c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 11 May 2009 13:47:25 -0700 Subject: gcc-canadian-sdk: Drop gcc-package-canadian-sdk.inc as we don't really need it. The contents of gcc-package-canadian-sdk.inc aren't actually installed / used for a canadian-sdk, and duplicating the unneeded python function lead to lockfile errors to boot (noted by David Huggins-Daines ). Signed-off-by: Tom Rini --- recipes/gcc/gcc-canadian-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-package-canadian-sdk.inc | 39 -------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 recipes/gcc/gcc-package-canadian-sdk.inc diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index 8859a47331..ab0a1f7ccb 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -12,7 +12,7 @@ require gcc-${PV}.inc DEPENDS = "gmp-canadian mpfr-canadian" require gcc-configure-canadian-sdk.inc -require gcc-package-canadian-sdk.inc +require gcc-package-sdk.inc SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \ file://pr22133-mingw-path-fixup.patch;patch=1 \ diff --git a/recipes/gcc/gcc-package-canadian-sdk.inc b/recipes/gcc/gcc-package-canadian-sdk.inc deleted file mode 100644 index dff53cdd96..0000000000 --- a/recipes/gcc/gcc-package-canadian-sdk.inc +++ /dev/null @@ -1,39 +0,0 @@ -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) -} -- cgit v1.2.3