[oe-commits] Jeremy Lainé : bitbake.conf: fix package population for darwin

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3b76c9298563ee81ea80d2abb015fd7315525d2c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3b76c9298563ee81ea80d2abb015fd7315525d2c

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Apr 17 19:56:18 2009 +0200

bitbake.conf: fix package population for darwin

* define SOLIBS and SOLIBSDEV for darwin9 (identical to darwin8)
* make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so

---

 conf/bitbake.conf |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f31e56d..e5073a1 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -199,19 +199,21 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl"
 SOLIBS = ".so.*"
 SOLIBS_darwin = ".*.dylib"
 SOLIBS_darwin8 = ".*.dylib"
+SOLIBS_darwin9 = ".*.dylib"
 
 SOLIBSDEV = ".so"
 SOLIBSDEV_darwin = ".dylib"
 SOLIBSDEV_darwin8 = ".dylib"
+SOLIBSDEV_darwin9 = ".dylib"
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 #enable this when bitbake is upgraded to cope with ++ values in the field
 PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
-FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
+FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-            ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
@@ -220,7 +222,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
             ${datadir}/gnome/help"
 SECTION_${PN}-doc = "doc"
 
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"