1 files changed, 9 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6f3d9bbd21..679fc9e6e2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -259,14 +259,17 @@ RPROVIDES = ""
 MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
 SOLIBS = ".so.*"
-SOLIBS_darwin = ".*.dylib"
+SOLIBS_darwin = ".dylib"
-SOLIBS_darwin8 = ".*.dylib"
+SOLIBS_darwin8 = ".dylib"
-SOLIBS_darwin9 = ".*.dylib"
+SOLIBS_darwin9 = ".dylib"
 SOLIBSDEV = ".so"
-SOLIBSDEV_darwin = ".dylib"
+# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin,
-SOLIBSDEV_darwin8 = ".dylib"
+# we can't make the symlinks end up in the -dev packages easily at this point. This hack
-SOLIBSDEV_darwin9 = ".dylib"
+# 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/conf/bitbake.conf b/meta/conf/bitbake.conf index 6f3d9bbd21..679fc9e6e2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf
@@ -259,14 +259,17 @@ RPROVIDES = ""
259	MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"	259	MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
260		260
261	SOLIBS = ".so.*"	261	SOLIBS = ".so.*"
262	SOLIBS_darwin = ".*.dylib"	262	SOLIBS_darwin = ".dylib"
263	SOLIBS_darwin8 = ".*.dylib"	263	SOLIBS_darwin8 = ".dylib"
264	SOLIBS_darwin9 = ".*.dylib"	264	SOLIBS_darwin9 = ".dylib"
265		265
266	SOLIBSDEV = ".so"	266	SOLIBSDEV = ".so"
267	SOLIBSDEV_darwin = ".dylib"	267	# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin,
268	SOLIBSDEV_darwin8 = ".dylib"	268	# we can't make the symlinks end up in the -dev packages easily at this point. This hack
269	SOLIBSDEV_darwin9 = ".dylib"	269	# at least means builds aren't completely broken and symlinks don't take up much space.
		270	SOLIBSDEV_darwin = ".dylibbroken"
		271	SOLIBSDEV_darwin8 = ".dylibbroken"
		272	SOLIBSDEV_darwin9 = ".dylibbroken"
270		273
271	PACKAGE_BEFORE_PN ?= ""	274	PACKAGE_BEFORE_PN ?= ""
272	PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"	275	PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"