[PATCH] bitbake.conf: pick up correct shared libraries on darwin

[PATCH] bitbake.conf: pick up correct shared libraries on darwin

[Jeremy Lainé]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

The attached patch does the following:
* define SOLIBS and SOLIBSDEV for darwin9 (identical to darwin8)
* make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so

-- 
Jeremy LAINE
Bolloré telecom | 11bis, rue Scribe | F-75009 Paris

[-- Attachment #2: solibs.patch --]
[-- Type: text/x-patch, Size: 1715 bytes --]

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"

Re: [PATCH] bitbake.conf: pick up correct shared libraries on darwin

[Jeremy Lainé]

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

Attached is a similar patch for lib_package.bbclass.

Note: was /lib purposefully hard-coded? I changed it to ${base_libdir} which seemed more
correct. Comments?

Cheers,
-- 
Jeremy LAINE
Bolloré telecom | 11bis, rue Scribe | F-75009 Paris

[-- Attachment #2: lib_package.patch --]
[-- Type: text/x-patch, Size: 818 bytes --]

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 9a48408..03ba9d0 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/*"

Re: [PATCH] bitbake.conf: pick up correct shared libraries on darwin

[Koen Kooi]

On 17-04-09 02:48, Jeremy Lainé wrote:
> The attached patch does the following:
> * define SOLIBS and SOLIBSDEV for darwin9 (identical to darwin8)
> * make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so

This one looks good to me.

regards,

Koen

Re: [PATCH] bitbake.conf: pick up correct shared libraries on darwin

[Koen Kooi]

On 17-04-09 03:20, Jeremy Lainé wrote:
> Attached is a similar patch for lib_package.bbclass.
>
> Note: was /lib purposefully hard-coded? I changed it to ${base_libdir} which seemed more
> correct. Comments?

looks good to me.

regards,

Koen

Re: [PATCH] bitbake.conf: pick up correct shared libraries on darwin

[Jeremy Lainé]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Koen Kooi wrote:
> On 17-04-09 02:48, Jeremy Lainé wrote:
>> The attached patch does the following:
>> * define SOLIBS and SOLIBSDEV for darwin9 (identical to darwin8)
>> * make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of
>> hardcoded .so.* and .so
>
> This one looks good to me.
>
Any other comments? Unless anybody raises an objection I will be
applying my two patches shortly.

- --
Jeremy LAINE
Bolloré telecom | 11bis, rue Scribe | F-75009 Paris
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknonaoACgkQCL1n3lVB9EbOIgCdEKGYeu4p7DpT9hA+G3ijgXAz
jAgAoJjbcffcK5eIGYhPdW6BlWXG58Zd
=9C2J
-----END PGP SIGNATURE-----