diff --git a/dev-libs/libpcre/libpcre-8.40.recipe b/dev-libs/libpcre/libpcre-8.42.recipe similarity index 57% rename from dev-libs/libpcre/libpcre-8.40.recipe rename to dev-libs/libpcre/libpcre-8.42.recipe index cbd8f0dde..9c01aa8d7 100644 --- a/dev-libs/libpcre/libpcre-8.40.recipe +++ b/dev-libs/libpcre/libpcre-8.42.recipe @@ -5,29 +5,42 @@ PCRE has its own native API, as well as a set of wrapper functions that \ correspond to the POSIX regular expression API. The PCRE library is free, even \ for building proprietary software. This package contains the native API." -COPYRIGHT="1997-2017 University of Cambridge +COPYRIGHT="1997-2018 University of Cambridge 2007-2012, Google Inc. All rights reserved." HOMEPAGE="http://www.pcre.org/" LICENSE="PCRE" -REVISION="3" -SOURCE_URI="https://downloads.sf.net/pcre/pcre-$portVersion.tar.bz2" -CHECKSUM_SHA256="00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4" +REVISION="1" +SOURCE_URI="https://ftp.pcre.org/pub/pcre/pcre-$portVersion.tar.bz2" +CHECKSUM_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301" SOURCE_DIR="pcre-$portVersion" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +pcreLibs="\ + libpcre \ + libpcrecpp \ + libpcreposix \ + " +libpcreVersion="1.2.10" +libpcrecppVersion="0.0.1" +libpcreposixVersion="0.0.6" +portVersionCompat="$portVersion compat >= 8" +for i in $pcreLibs; do + eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" +done + PROVIDES=" libpcre$secondaryArchSuffix = $portVersion - lib:libpcre$secondaryArchSuffix = 1.2.8 compat >= 1 - lib:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0 - lib:libpcreposix$secondaryArchSuffix = 0.0.4 compat >= 0 + lib:libpcre$secondaryArchSuffix = $libpcreVersionCompat + lib:libpcrecpp$secondaryArchSuffix = $libpcrecppVersionCompat + lib:libpcreposix$secondaryArchSuffix = $libpcreposixVersionCompat " if [ -z "$secondaryArchSuffix" ];then - PROVIDES="$PROVIDES - cmd:pcregrep = $portVersion compat >= 8 - cmd:pcretest = $portVersion compat >= 8 - " +PROVIDES="$PROVIDES + cmd:pcregrep = $portVersionCompat + cmd:pcretest = $portVersionCompat + " fi REQUIRES=" @@ -36,10 +49,10 @@ REQUIRES=" PROVIDES_devel=" libpcre${secondaryArchSuffix}_devel = $portVersion - cmd:pcre_config$secondaryArchSuffix = $portVersion compat >= 8 - devel:libpcre$secondaryArchSuffix = 1.2.8 compat >= 1 - devel:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0 - devel:libpcreposix$secondaryArchSuffix = 0.0.4 compat >= 0 + cmd:pcre_config$secondaryArchSuffix = $portVersionCompat + devel:libpcre$secondaryArchSuffix = $libpcreVersionCompat + devel:libpcrecpp$secondaryArchSuffix = $libpcrecppVersionCompat + devel:libpcreposix$secondaryArchSuffix = $libpcreposixVersionCompat " REQUIRES_devel=" libpcre$secondaryArchSuffix == $portVersion base @@ -53,11 +66,25 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:gcc$secondaryArchSuffix - cmd:make cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:sed " +debugList=( + "$libDir"/libpcre.so.$libpcreVersion + "$libDir"/libpcrecpp.so.$libpcrecppVersion + "$libDir"/libpcreposix.so.$libpcreposixVersion + ) +if [ -z "$secondaryArchSuffix" ]; then +for i in `echo "$PROVIDES" | sed -n -e \ + "s/^[\t]*cmd:\(.*\)$secondaryArchSuffix =.*/\1/p;"`; do + debugList+=("$binDir"/$i) +done +fi +defineDebugInfoPackage libpcre$secondaryArchSuffix "${debugList[@]}" + BUILD() { libtoolize --force --copy --install @@ -78,7 +105,7 @@ INSTALL() rm $libDir/libpcre*.la # prepare develop/lib - prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix + prepareInstalledDevelLibs $pcreLibs fixPkgconfig # fix pcre-config