summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-05 06:07:36 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-05 06:07:36 +0000
commit1dd9f646e674090ef78a0ac6007faf7da17de2f6 (patch)
tree4ca5b3e5a4239b9a4faed9572265ca36d54f999b
parent41e1b0f5afd093699d1f96baf8d8fbfa8aeb85a8 (diff)
downloadpackages-1dd9f646e674090ef78a0ac6007faf7da17de2f6.tar.gz
packages-1dd9f646e674090ef78a0ac6007faf7da17de2f6.tar.bz2
packages-1dd9f646e674090ef78a0ac6007faf7da17de2f6.tar.xz
packages-1dd9f646e674090ef78a0ac6007faf7da17de2f6.zip
system/pcre: ensure libraries are installed to /lib
Fixes grep usage in early OpenRC before /usr is mounted.
-rw-r--r--system/pcre/APKBUILD15
1 files changed, 8 insertions, 7 deletions
diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD
index 96a6e6123..9bb2638c5 100644
--- a/system/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pcre
pkgver=8.43
-pkgrel=1
+pkgrel=2
pkgdesc="Perl-compatible regular expression library"
url="http://pcre.sourceforge.net"
arch="all"
@@ -28,6 +28,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
+ --libdir=/lib \
$_enable_jit \
--enable-utf8 \
--enable-unicode-properties \
@@ -54,20 +55,20 @@ check() {
libpcrecpp() {
pkgdesc="C++ bindings for PCRE"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/
+ mkdir -p "$subpkgdir"/lib
+ mv "$pkgdir"/lib/libpcrecpp.so* "$subpkgdir"/lib/
}
libpcre16() {
pkgdesc="PCRE with 16 bit character support"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libpcre16.so* "$subpkgdir"/usr/lib/
+ mkdir -p "$subpkgdir"/lib
+ mv "$pkgdir"/lib/libpcre16.so* "$subpkgdir"/lib/
}
libpcre32() {
pkgdesc="PCRE with 32 bit character support"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libpcre32.so* "$subpkgdir"/usr/lib/
+ mkdir -p "$subpkgdir"/lib
+ mv "$pkgdir"/lib/libpcre32.so* "$subpkgdir"/lib/
}
tools() {