From b4155c5ef8c89d7032c40b2db485f4d034c2c4e0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 18 Jul 2018 21:21:27 -0500
Subject: system/xz: install to /lib

---
 system/xz/APKBUILD                            | 12 ++++++++----
 system/xz/dont-use-libdir-for-pkgconfig.patch | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 system/xz/dont-use-libdir-for-pkgconfig.patch

(limited to 'system')

diff --git a/system/xz/APKBUILD b/system/xz/APKBUILD
index 5e53aca60..253d3194c 100644
--- a/system/xz/APKBUILD
+++ b/system/xz/APKBUILD
@@ -2,15 +2,17 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=xz
 pkgver=5.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Library and command line tools for XZ and LZMA compressed files"
 url="https://tukaani.org/xz/"
 arch="all"
 license="Public-Domain AND LGPL-2.1+"
 depends=""
 makedepends=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
-source="https://tukaani.org/xz/xz-$pkgver.tar.gz"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-lang $pkgname-libs"
+source="https://tukaani.org/xz/xz-$pkgver.tar.gz
+	dont-use-libdir-for-pkgconfig.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -18,6 +20,7 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--libdir=/lib \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -44,4 +47,5 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname
 }
 
-sha512sums="e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578  xz-5.2.4.tar.gz"
+sha512sums="e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578  xz-5.2.4.tar.gz
+9310ae2568dd6ac474e3cb9895e1339ca2dbe8834f856edbb7d2264c0019bde4bbd94aa1edd34e5c8d0aed1f35a1877b0e053ed08a270835ea81e59c7be5edb3  dont-use-libdir-for-pkgconfig.patch"
diff --git a/system/xz/dont-use-libdir-for-pkgconfig.patch b/system/xz/dont-use-libdir-for-pkgconfig.patch
new file mode 100644
index 000000000..dbf4d5927
--- /dev/null
+++ b/system/xz/dont-use-libdir-for-pkgconfig.patch
@@ -0,0 +1,22 @@
+--- xz-5.2.4/src/liblzma/Makefile.am.old	2018-04-29 15:16:04.000000000 +0000
++++ xz-5.2.4/src/liblzma/Makefile.am	2018-07-19 02:18:19.010000000 +0000
+@@ -97,7 +97,7 @@
+ 
+ 
+ ## pkg-config
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = /usr/lib/pkgconfig
+ pkgconfig_DATA = liblzma.pc
+ EXTRA_DIST += liblzma.pc.in
+ 
+--- xz-5.2.4/src/liblzma/Makefile.in.old	2018-04-29 16:01:26.000000000 +0000
++++ xz-5.2.4/src/liblzma/Makefile.in	2018-07-19 02:18:33.600000000 +0000
+@@ -752,7 +752,7 @@
+ 
+ liblzma_la_LDFLAGS = -no-undefined -version-info 7:4:2 $(am__append_1) \
+ 	$(am__append_42)
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = /usr/lib/pkgconfig
+ pkgconfig_DATA = liblzma.pc
+ pc_verbose = $(pc_verbose_@AM_V@)
+ pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@)
-- 
cgit v1.2.3-60-g2f50