summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb1
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
260 260
261SOLIBS = ".so.*" 261SOLIBS = ".so.*"
262SOLIBS_darwin = ".dylib" 262SOLIBS_darwin = ".dylib"
263SOLIBS_darwin8 = ".dylib"
264SOLIBS_darwin9 = ".dylib"
265 263
266SOLIBSDEV = ".so" 264SOLIBSDEV = ".so"
267# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, 265# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin,
268# we can't make the symlinks end up in the -dev packages easily at this point. This hack 266# we can't make the symlinks end up in the -dev packages easily at this point. This hack
269# at least means builds aren't completely broken and symlinks don't take up much space. 267# at least means builds aren't completely broken and symlinks don't take up much space.
270SOLIBSDEV_darwin = ".dylibbroken" 268SOLIBSDEV_darwin = ".dylibbroken"
271SOLIBSDEV_darwin8 = ".dylibbroken"
272SOLIBSDEV_darwin9 = ".dylibbroken"
273 269
274PACKAGE_BEFORE_PN ?= "" 270PACKAGE_BEFORE_PN ?= ""
275PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" 271PACKAGES = "${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} = "\
22 nativesdk-automake \ 22 nativesdk-automake \
23 " 23 "
24 24
25RDEPENDS_${PN}_darwin8 = "\ 25RDEPENDS_${PN}_darwin = "\
26 odcctools-cross-canadian \ 26 odcctools-cross-canadian \
27 llvm-cross-canadian \ 27 llvm-cross-canadian \
28 nativesdk-pkgconfig \ 28 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
10 10
11EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" 11EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
12EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 12EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
13EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
14 13
15do_configure_prepend () { 14do_configure_prepend () {
16 cp ${WORKDIR}/acinclude.m4 ${S}/ 15 cp ${WORKDIR}/acinclude.m4 ${S}/