| 1 |
commit: 83da68b1c768ca8c10918dfa287a35b845febaad |
| 2 |
Author: Marty Plummer <ntzrmtthihu777 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 29 18:42:57 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 30 08:09:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83da68b1 |
| 7 |
|
| 8 |
sys-libs/zlib: fix zlib.pc generation for mingw-64 |
| 9 |
|
| 10 |
Without this change two zlib.pc files are built on mingw-w64, |
| 11 |
one in /usr/share/pkgconfig with the correct values and one in |
| 12 |
/usr/lib/pkgconfig with incorrect path values pointing to the |
| 13 |
build dir. |
| 14 |
|
| 15 |
This places zlib.pc in a location mirroring the native install |
| 16 |
and corrects the values. |
| 17 |
|
| 18 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 19 |
Closes: https://github.com/gentoo/gentoo/pull/4803 |
| 20 |
|
| 21 |
sys-libs/zlib/zlib-1.2.11.ebuild | 5 +++-- |
| 22 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild |
| 25 |
index b587d42dae1..83ff762d7ec 100644 |
| 26 |
--- a/sys-libs/zlib/zlib-1.2.11.ebuild |
| 27 |
+++ b/sys-libs/zlib/zlib-1.2.11.ebuild |
| 28 |
@@ -69,7 +69,7 @@ multilib_src_compile() { |
| 29 |
*-mingw*|mingw*) |
| 30 |
emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- |
| 31 |
sed \ |
| 32 |
- -e 's|@prefix@|${EPREFIX}/usr|g' \ |
| 33 |
+ -e 's|@prefix@|/usr|g' \ |
| 34 |
-e 's|@exec_prefix@|${prefix}|g' \ |
| 35 |
-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
| 36 |
-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
| 37 |
@@ -98,7 +98,8 @@ multilib_src_install() { |
| 38 |
LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ |
| 39 |
INCLUDE_PATH="${ED}/usr/include" \ |
| 40 |
SHARED_MODE=1 |
| 41 |
- insinto /usr/share/pkgconfig |
| 42 |
+ # overwrites zlib.pc created from win32/Makefile.gcc #620136 |
| 43 |
+ insinto /usr/$(get_libdir)/pkgconfig |
| 44 |
doins zlib.pc |
| 45 |
;; |
Archives