Patchwork libxslt: fix packaging of static libraries

login
register
mail settings
Submitter Phil Blundell
Date Aug. 17, 2011, 1:56 p.m.
Message ID <1313589414.6733.219.camel@phil-desktop>
Download mbox | patch
Permalink /patch/10115/
State New, archived
Headers show

Comments

Phil Blundell - Aug. 17, 2011, 1:56 p.m.
This prevents warnings about .a files being installed but not shipped.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-support/libxslt/libxslt_1.1.26.bb |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
Saul Wold - Aug. 23, 2011, 1:03 a.m.
On 08/17/2011 06:56 AM, Phil Blundell wrote:
> This prevents warnings about .a files being installed but not shipped.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/recipes-support/libxslt/libxslt_1.1.26.bb |   15 ++++++++-------
>   1 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> index b5f6962..cc64ba7 100644
> --- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> +++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> @@ -6,8 +6,8 @@ LICENSE = "MIT"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
>
>   SECTION = "libs"
> -DEPENDS = "libxml2 (>=2.6.27)"
> -PR = "r1"
> +DEPENDS = "libxml2"
> +PR = "r2"
>
>   SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
>              file://pkgconfig_fix.patch;patch=1"
> @@ -16,13 +16,14 @@ SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
>   SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
>   S = "${WORKDIR}/libxslt-${PV}"
>
> -inherit autotools pkgconfig binconfig
> +inherit autotools pkgconfig binconfig lib_package
>
>   EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
> +# older versions of this recipe had ${PN}-utils
> +RPROVIDES_${PN}-bin += "${PN}-utils"
> +RCONFLICTS_${PN}-bin += "${PN}-utils"
> +RREPLACES_${PN}-bin += "${PN}-utils"
>
> -PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
> -
> -FILES_${PN}-dev += "${bindir}/xslt-config"
> -FILES_${PN}-utils += "${bindir}"
> +FILES_${PN}-dev += "${bindir}/xsltConf.sh"
>
>   BBCLASSEXTEND = "native"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index b5f6962..cc64ba7 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -6,8 +6,8 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
 
 SECTION = "libs"
-DEPENDS = "libxml2 (>=2.6.27)"
-PR = "r1"
+DEPENDS = "libxml2"
+PR = "r2"
 
 SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch;patch=1"
@@ -16,13 +16,14 @@  SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
 SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
 S = "${WORKDIR}/libxslt-${PV}"
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig lib_package
 
 EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+# older versions of this recipe had ${PN}-utils
+RPROVIDES_${PN}-bin += "${PN}-utils"
+RCONFLICTS_${PN}-bin += "${PN}-utils"
+RREPLACES_${PN}-bin += "${PN}-utils"
 
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
+FILES_${PN}-dev += "${bindir}/xsltConf.sh"
 
 BBCLASSEXTEND = "native"