Patchwork [13/20] libtool: refactor packages for staticdev

login
register
mail settings
Submitter Saul Wold
Date Jan. 21, 2012, 5:18 a.m.
Message ID <1b0c6306e6ea02b92ce5a1bac7ce21a31ad13204.1327123057.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19899/
State Accepted
Commit 63bfddf162cea836748e56da1488de56758d0418
Headers show

Comments

Saul Wold - Jan. 21, 2012, 5:18 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.2.inc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
Koen Kooi - Jan. 27, 2012, 8:21 a.m.
Op 21 jan. 2012, om 06:18 heeft Saul Wold het volgende geschreven:

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/libtool/libtool-2.4.2.inc |    9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> index a8ea0ae..d55b2bd 100644
> --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>     file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
> 
> -INC_PR = "r0"
> +INC_PR = "r1"
> 
> SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
>            file://trailingslash.patch \
> @@ -34,10 +34,11 @@ EXTRA_AUTORECONF = "--exclude=libtoolize"
> 
> DEPENDS = "libtool-native"
> 
> -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
> +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev"
> FILES_${PN} += "${datadir}/aclocal*"
> -FILES_libltdl = "${libdir}/libltdl.so.*"
> -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/*.h"
> +FILES_libltdl = "${libdir}/libltdl${SOLIBS}

The missing quote prohibits OE from packaging it correctly, leading to:

|  * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-gnome:
|  *    libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *   libltdl7 (>= 2.4.2) *

For incremental builds and binary feeds.

regards,

Koen

Patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index a8ea0ae..d55b2bd 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,7 +8,7 @@  LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://trailingslash.patch \
@@ -34,10 +34,11 @@  EXTRA_AUTORECONF = "--exclude=libtoolize"
 
 DEPENDS = "libtool-native"
 
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev"
 FILES_${PN} += "${datadir}/aclocal*"
-FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/*.h"
+FILES_libltdl = "${libdir}/libltdl${SOLIBS}
+FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}"
+FILES_libltdl-staticdev = "${libdir}/libltdl.a"
 FILES_libltdl-dbg = "${libdir}/.debug/"
 
 EXTRA_OECONF = "--with-sysroot"