diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-06-17 11:17:23 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-17 11:17:23 +0200 |
| commit | 402f1f697406d4d1a844a6c6b7736435053d69c6 (patch) | |
| tree | 8aa68cdca22b28f77adda5c0b1affd46fdd3dd02 /recipes/libpcre | |
| parent | 179f4f5c3450f169bc74445222d599b14aae1913 (diff) | |
| download | openembedded-402f1f697406d4d1a844a6c6b7736435053d69c6.tar.gz | |
libpcre: fix staging and packaging
Diffstat (limited to 'recipes/libpcre')
| -rw-r--r-- | recipes/libpcre/libpcre_7.6.bb | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb index eb5af03db0..aa038c6e95 100644 --- a/recipes/libpcre/libpcre_7.6.bb +++ b/recipes/libpcre/libpcre_7.6.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 = "r3" +PR = "r4" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -17,7 +17,6 @@ inherit autotools binconfig PARALLEL_MAKE = "" -LEAD_SONAME = "libpcre.so" CFLAGS_append = " -D_REENTRANT" CXXFLAGS_powerpc += "-lstdc++" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8" @@ -40,13 +39,19 @@ do_compile () { } do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - install -d ${STAGING_BINDIR_NATIVE} + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE} install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ } -FILES_${PN} = "${libdir}/lib*.so.*" +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) +} + +FILES_${PN} = "${libdir}/libpcre.so.*" FILES_${PN}-dev += "${bindir}/*" |