From a4f79016c537fc93e5a487d51a22fb4d01e9afe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Fri, 17 Apr 2009 19:57:32 +0200
Subject: lib_package.bbclass: fix package population on darwin

* make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so
---
 classes/lib_package.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes/lib_package.bbclass')

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 9a48408527..03ba9d094f 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -1,9 +1,9 @@
 PACKAGES += "${PN}-bin"
 
-FILES_${PN} = "${libexecdir} ${libdir}/lib*.so.* \
+FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
 	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+	    ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
 		${datadir}/aclocal ${bindir}/*-config"
 FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*"
-- 
cgit v1.2.3


From ba434bd1dc9dc8ed61953a1579ea9e993e81cbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Mon, 20 Apr 2009 11:42:08 +0200
Subject: bitbake.conf, lib_package.bbclass: fix packaging of
 ${base_libdir}/*.so

We need to include ${base_libdir}/*${SOLIBSDEV} in FILES_${PN]}  because
the shared libraries in ${base_libdir} do not follow the usual *.so.* naming
convention, for instance libproc-3.2.7.so.
---
 classes/lib_package.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'classes/lib_package.bbclass')

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 03ba9d094f..f866d10951 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -1,8 +1,12 @@
 PACKAGES += "${PN}-bin"
 
+# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries
+# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance
+# libproc-3.2.7.so
 FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
 	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}"
+	    ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \
+	    ${datadir}/${PN} ${libdir}/${PN}"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
 		${datadir}/aclocal ${bindir}/*-config"
-- 
cgit v1.2.3


From 5dc5513ff17822f5ef092852476a901bab47b4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Mon, 20 Apr 2009 12:09:24 +0200
Subject: bitbake.conf, lib_package.bbclass: fix missing '$' in previous commit

---
 classes/lib_package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/lib_package.bbclass')

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index f866d10951..788b7bb0c4 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -5,7 +5,7 @@ PACKAGES += "${PN}-bin"
 # libproc-3.2.7.so
 FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
 	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \
+	    ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \
 	    ${datadir}/${PN} ${libdir}/${PN}"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
-- 
cgit v1.2.3