From 1dd9f646e674090ef78a0ac6007faf7da17de2f6 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 5 Aug 2019 06:07:36 +0000
Subject: system/pcre: ensure libraries are installed to /lib

Fixes grep usage in early OpenRC before /usr is mounted.
---
 system/pcre/APKBUILD | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'system')

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() {
-- 
cgit v1.2.3-60-g2f50