libjpeg-turbo: fix libturbojpeg packaging
PATCH 1/1 libjpeg-turbo: fix libturbojpeg packaging
From: Jack Mitchell <[email protected]>
put libjpegturbo library files and headers into correct packages rather than them being in the main libjpeg-turbo package.
remove INSANE_SKIP[dev-so]
move .so, .a into -dev package
move .la into -staticdev
move .so.* into main library package
--- meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +4 -3
@@ -25,13 +25,14 @@ inherit autotools pkgconfig EXTRA_OECONF = "--with-jpeg8 " -PACKAGES =+ "jpeg-tools libturbojpeg" +PACKAGES =+ "jpeg-tools libturbojpeg libturbojpeg-staticdev libturbojpeg-dev" DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." FILES_jpeg-tools = "${bindir}/*" -FILES_libturbojpeg = "${libdir}/libturbojpeg.so" -INSANE_SKIP_libturbojpeg = "dev-so" +FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" +FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a" +FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la ${incdir}/turbojpeg.h ${libdir}/libturbojpeg.so" BBCLASSEXTEND = "native" DEPENDS = "nasm-native"
Signature · 1 line
2.5.1
Quoted 22 lines · On Wed, Sep 02, 2015 at 12:10:59PM +0100, [email protected] wrote:
From: Jack Mitchell <[email protected]>
put libjpegturbo library files and headers into correct packages rather than them being in the main libjpeg-turbo package.
remove INSANE_SKIP[dev-so]
move .so, .a into -dev package
move .la into -staticdev
move .so.* into main library packageSigned-off-by Jack Mitchell <[email protected]>--- meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +0
-0@@ -25,13 +25,14 @@ inherit autotools pkgconfig EXTRA_OECONF = "--with-jpeg8 "
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb inherit autotools pkgconfig · line 33
Quoted 10 lines
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +2
-3-PACKAGES =+ "jpeg-tools libturbojpeg" +PACKAGES =+ "jpeg-tools libturbojpeg libturbojpeg-staticdev libturbojpeg-dev" DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." FILES_jpeg-tools = "${bindir}/*" -FILES_libturbojpeg = "${libdir}/libturbojpeg.so" -INSANE_SKIP_libturbojpeg = "dev-so" +FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*"
You can use libturbojpeg*${SOLIBS}
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb inherit autotools pkgconfig · line 35
Quoted 2 lines
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +2
-0+FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a" +FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la ${incdir}/turbojpeg.h ${libdir}/libturbojpeg.so"
libturbojpeg.so -> lib*${SOLIBSDEV} and we should use only one -dev/-staticdev package for recipe (people who need to install -dev/-staticdef package to rootfs usually don't mind getting few more files installed as well).
But more importantly I don't understand how dev-so and other files got into libturbojpeg package when it's using:
FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
So I think the problem is somewhere else.
Quoted 11 lines
meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +0
-0BBCLASSEXTEND = "native" DEPENDS = "nasm-native"Signature · 7 lines
2.5.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 6 lines · Martin Jansa
But more importantly I don't understand how dev-so and other files got into libturbojpeg package when it's using:
FILES_libturbojpeg= "${libdir}/libturbojpeg.so"So I think the problem is somewhere else.
it uses PACKAGES =+ "jpeg-tools libturbojpeg" that could precede the default packages
Quoted 10 lines · Khem Raj
Quoted 6 lines · Martin Jansa
But more importantly I don't understand how dev-so and other files got into libturbojpeg package when it's using:
FILES_libturbojpeg= "${libdir}/libturbojpeg.so"So I think the problem is somewhere else.
it uses PACKAGES =+ "jpeg-tools libturbojpeg" that could precede the default packages
yes, but FILES_libturbojpeg includes only one file, not the headers and the staticdev files, so changing it toFILES_libturbojpeg = "${libdir}/libturbojpeg${SOLIBS}" should be enough to remove that INSANE_SKIP.
Quoted 5 lines
Signature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 02-09-15 om 15:23 schreef Martin Jansa:
Quoted 44 lines · On Wed, Sep 02, 2015 at 12:10:59PM +0100, [email protected] wrote:
Quoted 32 lines
From: Jack Mitchell <[email protected]>
put libjpegturbo library files and headers into correct packages rather than them being in the main libjpeg-turbo package.
remove INSANE_SKIP[dev-so] move .so, .a into -dev package move .la into -staticdev move .so.* into main library package
Signed-off-by Jack Mitchell <[email protected]> ---meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
(quoted diff) +0
-0b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb index 8e214c9..16f62c5 100644 --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb @@ -25,13 +25,14 @@ inherit autotools pkgconfig
EXTRA_OECONF= "--with-jpeg8 "-PACKAGES =+ "jpeg-tools libturbojpeg" +PACKAGES =+ "jpeg-tools libturbojpeg libturbojpeg-staticdev libturbojpeg-dev"
DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." FILES_jpeg-tools = "${bindir}/*"
(quoted diff) +0
-2-FILES_libturbojpeg = "${libdir}/libturbojpeg.so" -INSANE_SKIP_libturbojpeg = "dev-so" +FILES_libturbojpeg =Quoted 1 line
"${libdir}/libturbojpeg.so.*"
You can use libturbojpeg*${SOLIBS}
Quoted 3 lines
(quoted diff) +2
-0+FILES_libturbojpeg-staticdev = "${libdir}/libturbojpeg.a" +FILES_libturbojpeg-dev = "${libdir}/libturbojpeg.la
${incdir}/turbojpeg.h${libdir}/libturbojpeg.so"libturbojpeg.so -> lib*${SOLIBSDEV} and we should use only one
(quoted diff) +0
-2-dev/-staticdev package for recipe (people who need to install -dev/-staticdef package to rootfs usually don't mind getting few more
Quoted 1 line
files installed as well).
The "one -dev package to rule them all" lead to the "why does my rootfs suddenly have systemd?!?!" earlier on. I advocate doing the proper splitting like Jack does above, but with a small change: RDEPENDS_${PN}-dev += libturbojpeg-dev.
I admit that I don't have a strong opinion on the split in this specific case, though.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFV6BMIMkyGM64RGpERAlZ3AJ9VqAy7Y+dNKcouMHPdUoh/9YqjbgCfVhAz 3vd4pqQozNXCBvm7ULIyMcI=
=UfL0
-----END PGP SIGNATURE-----