Patchwork [3/6] libpcre: Fix QA warnings

login
register
mail settings
Submitter Richard Purdie
Date July 1, 2011, 3:17 p.m.
Message ID <d12762f5a027f72d03f22b5cd7f34b7b1a92961e.1309533254.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/6855/
State New, archived
Headers show

Comments

Richard Purdie - July 1, 2011, 3:17 p.m.
From: Richard  Purdie <richard.purdie@linuxfoundation.org>

This drops the split -dev packaging since it was broken and overcomplex. It ensures .so
symlinks end up in the correct package.

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/libpcre/libpcre_8.12.bb |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
index 0301ddb..33003c5 100644
--- a/meta/recipes-support/libpcre/libpcre_8.12.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
@@ -5,7 +5,7 @@  provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r0"
+PR = "r1"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
@@ -45,11 +45,7 @@  do_compile () {
 
 python populate_packages_prepend () {
 	pcre_libdir = bb.data.expand('${libdir}', d)
-	pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
-	do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True)
-	do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev')
-	do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev')
-	do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True)
+	do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.+', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True)
 }
 
 FILES_${PN} = "${libdir}/libpcre.so.*"