summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 10:40:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-23 16:20:13 +0100
commit45de2c2b5a98d2d353b439440e3439893de093de (patch)
treeb3209823fa78105ac6ff0e6e42e9613fdb22123b /meta/conf
parent2da6d0b9fff49f92cfc2de5da537f3802bc87989 (diff)
downloadpoky-45de2c2b5a98d2d353b439440e3439893de093de.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. (From OE-Core rev: 8d5e6eed7802a6056f9eaa50a85e3eee00fe2742) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 0 insertions, 4 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}"