From 9323b45483f6674d75d5bffa47e3592e0b02c3c6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 20:38:41 +0200 Subject: [PATCH] Update libpcre recipe * Add commands to provides. * Fix autotools invocation order (it failed here before). * Use jobArgs. * Fix developLibDir paths in pcre-config. * Remove unnecessary cd in TEST() (untested). --- dev-libs/libpcre/libpcre-8.21.recipe | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 768c3bb42..94ffd25c4 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -15,11 +15,14 @@ COPYRIGHT=" " SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" libpcre = $portVersion + cmd:pcre_config = $portVersion compat >= 8 + cmd:pcregrep = $portVersion compat >= 8 + cmd:pcretest = $portVersion compat >= 8 lib:libpcre = $portVersion compat >= 8 lib:libpcrecpp = $portVersion compat >= 8 lib:libpcreposix = $portVersion compat >= 8 @@ -45,16 +48,15 @@ SOURCE_DIR="pcre-$portVersion" BUILD() { - automake --add-missing libtoolize --force --copy --install aclocal autoconf - automake + automake --add-missing ./configure $configureDirArgs \ --enable-utf8 \ --enable-unicode-properties \ --with-pic - make + make $jobArgs } INSTALL() @@ -64,10 +66,12 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix fixPkgconfig + + # fix pcre-config + fixDevelopLibDirReferences $binDir/pcre-config } TEST() { - cd pcre-8.21 make check }