Patchwork bzip2: split into binary and library packages

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 25, 2012, 1:19 a.m.
Message ID <1330132760-12519-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/22015/
State New
Headers show

Comments

Andreas Oberritter - Feb. 25, 2012, 1:19 a.m.
* Create libbz2 (and -dev, -staticdev), which can be
  installed without the bzip2 executables.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
Koen Kooi - Feb. 25, 2012, 9:02 a.m.
Op 25 feb. 2012, om 02:19 heeft Andreas Oberritter het volgende geschreven:

> * Create libbz2 (and -dev, -staticdev), which can be
>  installed without the bzip2 executables.

You need a PR bump for everything that links against libbz2 to ensure clean upgrade paths.
Andreas Oberritter - Feb. 26, 2012, 5:27 p.m.
On 25.02.2012 10:02, Koen Kooi wrote:
> 
> Op 25 feb. 2012, om 02:19 heeft Andreas Oberritter het volgende geschreven:
> 
>> * Create libbz2 (and -dev, -staticdev), which can be
>>  installed without the bzip2 executables.
> 
> You need a PR bump for everything that links against libbz2 to ensure clean upgrade paths.

Are you sure? I'm asking because existing packages still depend on
bzip2, which now depends on libbz2.
Koen Kooi - Feb. 26, 2012, 8:24 p.m.
Op 26 feb. 2012, om 18:27 heeft Andreas Oberritter het volgende geschreven:

> On 25.02.2012 10:02, Koen Kooi wrote:
>> 
>> Op 25 feb. 2012, om 02:19 heeft Andreas Oberritter het volgende geschreven:
>> 
>>> * Create libbz2 (and -dev, -staticdev), which can be
>>> installed without the bzip2 executables.
>> 
>> You need a PR bump for everything that links against libbz2 to ensure clean upgrade paths.
> 
> Are you sure? I'm asking because existing packages still depend on
> bzip2, which now depends on libbz2.

DEPENDS yes, RDEPENDS yes, shlibdeps, no

Patch

diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index 14cd240..fa8310e 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -6,7 +6,7 @@  HOMEPAGE = "http://www.bzip.org/"
 SECTION = "console/utils"
 LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
            file://configure.ac \
@@ -15,6 +15,8 @@  SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
 SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
 SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
 
+PACKAGES =+ "libbz2 libbz2-dev libbz2-staticdev"
+
 CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
 
 inherit autotools update-alternatives
@@ -28,5 +30,15 @@  do_configure_prepend () {
 	cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
 }
 
+FILES_libbz2 = "${libdir}/lib*${SOLIBS}"
+
+FILES_libbz2-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
+SECTION_libbz2-dev = "devel"
+RDEPENDS_libbz2-dev = "libbz2 (= ${EXTENDPKGV})"
+
+FILES_libbz2-staticdev = "${libdir}/*.a"
+SECTION_libbz2-staticdev = "devel"
+RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
+
 PROVIDES_append_virtclass-native = " bzip2-full-native"
 BBCLASSEXTEND = "native"