From f53ec3df1df9b9df94e49fae18d1a29acaeac091 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 24 Nov 2019 22:15:49 +0100 Subject: main/pcre2: upgrade to 10.34 --- main/pcre2/APKBUILD | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/main/pcre2/APKBUILD b/main/pcre2/APKBUILD index 471ffff565e..68790d58ea7 100644 --- a/main/pcre2/APKBUILD +++ b/main/pcre2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka # Maintainer: Jakub Jirutka pkgname=pcre2 -pkgver=10.33 +pkgver=10.34 pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="https://pcre.org/" @@ -11,8 +11,7 @@ depends_dev="libedit-dev zlib-dev" makedepends="$depends_dev paxmark" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcre2-16:_libpcre libpcre2-32:_libpcre" -source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" +source="https://ftp.pcre.org/pub/pcre/pcre2-$pkgver.tar.gz" case "$CARCH" in s390x) _enable_jit="";; @@ -20,8 +19,6 @@ case "$CARCH" in esac build() { - cd "$builddir" - case "$CARCH" in mips64*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0";; mips*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0 -DSLJIT_MIPS_R1=1";; @@ -47,8 +44,6 @@ build() { # Note: RunTest and pcre2_jit_test generates some binaries in .libs that needs # to disable MPROTECT on grsecurity kernel. That's why it's so complicated... check() { - cd "$builddir" - local is_pax=$(grep -q PaX /proc/$$/status && echo 'yes' || echo 'no') if [ "$is_pax" = yes ]; then @@ -67,8 +62,6 @@ check() { } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install } @@ -87,4 +80,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="649983c7725e2fd2451ba89243b4c08c408fc279b7be3b2d225045cced3b0667ff6da4c9dd37510eb9e5aed6478aff54c2dbd1d92f4d0f1174579df9ec2c1882 pcre2-10.33.tar.gz" +sha512sums="820b3805fc7fcf3a80dfd42ff570efc8518fe3c50f3feb720319b95316619e5b8f6601b3c9522606315aecd5558ccfc8a04a89fab9921fdfc3400dc2caf17c22 pcre2-10.34.tar.gz" -- cgit v1.2.3