diff options
| author | linear <dev@linear.network> | 2021-09-01 07:38:14 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2021-09-01 09:43:35 +0000 |
| commit | a85e0a0d8a0fe9ae5d069db5d7f938c0322fb95e (patch) | |
| tree | 0912bb1d32ec555bd686bebf619585536f3e0230 | |
| parent | 66b43a61ccff1b01b28dc46c4ddd17b62d88f9f1 (diff) | |
main/pcre: update libtool and use sysroot to avoid pulling host libs when cross compiling
| -rw-r--r-- | main/pcre/APKBUILD | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index 5db5f5f2423..4fca1420c26 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre pkgver=8.45 -pkgrel=0 +pkgrel=1 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" arch="all" +makedepends="m4 libtool autoconf automake" license="BSD-3-Clause" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcrecpp libpcre16 libpcre32" @@ -20,6 +21,18 @@ source="https://ftp.pcre.org/pub/pcre/pcre-$pkgver.tar.bz2" # - CVE-2017-11164 # - CVE-2017-16231 +# use sysroot if cross compiling to avoid pulling in system libs +[ "$CBUILD" != "$CHOST" ] && _cross_configure="--with-sysroot=$CBUILDROOT" + +prepare() { + default_prepare + + # update libtool so it won't use system libs when a sysroot is provided + libtoolize -f && + aclocal && + autoconf && + automake --add-missing +} build() { local _enable_jit="--enable-jit" @@ -42,8 +55,8 @@ build() { --enable-pcre32 \ --with-match-limit-recursion=8192 \ --htmldir=/usr/share/doc/$pkgname-$pkgver/html \ - --docdir=/usr/share/doc/$pkgname-$pkgver - + --docdir=/usr/share/doc/$pkgname-$pkgver \ + $_cross_configure make } |