diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 10:40:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 18:30:07 +0100 |
| commit | 8d5e6eed7802a6056f9eaa50a85e3eee00fe2742 (patch) | |
| tree | 320b07a18788b1174377cb5307c3eaae6f8831fb | |
| parent | 51c3dbe2df45096bbd7866adabb08e114952ff13 (diff) | |
| download | openembedded-core-contrib-8d5e6eed7802a6056f9eaa50a85e3eee00fe2742.tar.gz | |
Drop darwin8/darwin9 usage
There were darwin8/darwin9 overrides spinkled in the code from times gone
by. Lets settle on the darwin override and remove the others since its pointless
duplication. We always inject darwin into OVERRIDES if needed in the darwin8/9
cases.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 679fc9e6e2..8f98a93dc5 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -260,16 +260,12 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativ SOLIBS = ".so.*" SOLIBS_darwin = ".dylib" -SOLIBS_darwin8 = ".dylib" -SOLIBS_darwin9 = ".dylib" SOLIBSDEV = ".so" # Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, # we can't make the symlinks end up in the -dev packages easily at this point. This hack # at least means builds aren't completely broken and symlinks don't take up much space. SOLIBSDEV_darwin = ".dylibbroken" -SOLIBSDEV_darwin8 = ".dylibbroken" -SOLIBSDEV_darwin9 = ".dylibbroken" PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 63fea288f8..84fb95d393 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ " -RDEPENDS_${PN}_darwin8 = "\ +RDEPENDS_${PN}_darwin = "\ odcctools-cross-canadian \ llvm-cross-canadian \ nativesdk-pkgconfig \ diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d2312685aa..928a0cd688 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" -EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" do_configure_prepend () { cp ${WORKDIR}/acinclude.m4 ${S}/ |