Patchwork [08/26] sqlite3: inherit shared_lib class

login
register
mail settings
Submitter Saul Wold
Date July 11, 2011, 11:13 p.m.
Message ID <d92f0fcf6f83379a91b23e697cd43ac00078257e.1310425837.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7355/
State New, archived
Headers show

Comments

Saul Wold - July 11, 2011, 11:13 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/sqlite/sqlite3.inc |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
Koen Kooi - July 12, 2011, 7 a.m.
Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-support/sqlite/sqlite3.inc |   10 ++--------
> 1 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
> index a5d122d..5f1adb3 100644
> --- a/meta/recipes-support/sqlite/sqlite3.inc
> +++ b/meta/recipes-support/sqlite/sqlite3.inc
> @@ -5,7 +5,7 @@ DEPENDS = "readline ncurses"
> DEPENDS_virtclass-native = ""
> LICENSE = "PD"
> 
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig shared_lib

that has lib${PN} at the end of packages

> -PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"

And this one at the front.

> -FILES_${PN} = "${bindir}/*"
> -FILES_lib${PN} = "${libdir}/*.so.*"
> -FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
> -		       ${libdir}/pkgconfig ${includedir}"
> -FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
> -AUTO_LIBNAME_PKGS = "lib${PN}"
> +FILES_lib${PN}-doc += "${docdir} ${mandir} ${infodir}"
> 
> BBCLASSEXTEND = "native nativesdk"
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Saul Wold - July 12, 2011, 6:41 p.m.
On 07/12/2011 12:00 AM, Koen Kooi wrote:
>
> Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:
>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> meta/recipes-support/sqlite/sqlite3.inc |   10 ++--------
>> 1 files changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
>> index a5d122d..5f1adb3 100644
>> --- a/meta/recipes-support/sqlite/sqlite3.inc
>> +++ b/meta/recipes-support/sqlite/sqlite3.inc
>> @@ -5,7 +5,7 @@ DEPENDS = "readline ncurses"
>> DEPENDS_virtclass-native = ""
>> LICENSE = "PD"
>>
>> -inherit autotools pkgconfig
>> +inherit autotools pkgconfig shared_lib
>
> that has lib${PN} at the end of packages
>
The renamed shlibpackaging.bbclass has PACKAGES += "lib${PN}, that an 
perpend according to my understanding.

>> -PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"
>
> And this one at the front.
>
So they are the same.

Sau!

>> -FILES_${PN} = "${bindir}/*"
>> -FILES_lib${PN} = "${libdir}/*.so.*"
>> -FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
>> -		       ${libdir}/pkgconfig ${includedir}"
>> -FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
>> -AUTO_LIBNAME_PKGS = "lib${PN}"
>> +FILES_lib${PN}-doc += "${docdir} ${mandir} ${infodir}"
>>
>> BBCLASSEXTEND = "native nativesdk"
>> --
>> 1.7.3.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Phil Blundell - July 12, 2011, 6:48 p.m.
On Tue, 2011-07-12 at 11:41 -0700, Saul Wold wrote:
> The renamed shlibpackaging.bbclass has PACKAGES += "lib${PN}, that an 
> perpend according to my understanding.

No, that's an append.  See the fine (though I say so myself) manual:

http://bitbake.berlios.de/manual/ch02.html#id868981

p.
Saul Wold - July 12, 2011, 7:24 p.m.
On 07/12/2011 11:48 AM, Phil Blundell wrote:
> On Tue, 2011-07-12 at 11:41 -0700, Saul Wold wrote:
>> The renamed shlibpackaging.bbclass has PACKAGES += "lib${PN}, that an
>> perpend according to my understanding.
>
> No, that's an append.  See the fine (though I say so myself) manual:
>
> http://bitbake.berlios.de/manual/ch02.html#id868981
>
My bad, I have read that, and I did the dyslexic thing, I will be more 
careful in the future.

Sau!

> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index a5d122d..5f1adb3 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -5,7 +5,7 @@  DEPENDS = "readline ncurses"
 DEPENDS_virtclass-native = ""
 LICENSE = "PD"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig shared_lib
 
 EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
 EXTRA_OECONF_virtclass-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
@@ -17,12 +17,6 @@  export config_TARGET_LINK = "${CCLD}"
 export config_TARGET_CFLAGS = "${CFLAGS}"
 export config_TARGET_LFLAGS = "${LDFLAGS}"
 
-PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"
-FILES_${PN} = "${bindir}/*"
-FILES_lib${PN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
-		       ${libdir}/pkgconfig ${includedir}"
-FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
-AUTO_LIBNAME_PKGS = "lib${PN}"
+FILES_lib${PN}-doc += "${docdir} ${mandir} ${infodir}"
 
 BBCLASSEXTEND = "native nativesdk"