diff options
| author |   Marty Plummer <ntzrmtthihu777@gmail.com> | 2017-05-29 13:42:57 -0500 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2017-05-30 10:09:14 +0200 |
| commit | 83da68b1c768ca8c10918dfa287a35b845febaad (patch) | |
| tree | 3d723f6c59caaaa525b507de5072616fa0a40932 /sys-libs | |
| parent | x11-misc/lineakd: EAPI bump for user patches. (diff) | |
| download | gentoo-83da68b1c768ca8c10918dfa287a35b845febaad.tar.gz gentoo-83da68b1c768ca8c10918dfa287a35b845febaad.tar.bz2 gentoo-83da68b1c768ca8c10918dfa287a35b845febaad.zip | |
sys-libs/zlib: fix zlib.pc generation for mingw-64
Without this change two zlib.pc files are built on mingw-w64,
one in /usr/share/pkgconfig with the correct values and one in
/usr/lib/pkgconfig with incorrect path values pointing to the
build dir.
This places zlib.pc in a location mirroring the native install
and corrects the values.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4803
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.11.ebuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild index b587d42dae18..83ff762d7ecb 100644 --- a/sys-libs/zlib/zlib-1.2.11.ebuild +++ b/sys-libs/zlib/zlib-1.2.11.ebuild @@ -69,7 +69,7 @@ multilib_src_compile() { *-mingw*|mingw*) emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- sed \ - -e 's|@prefix@|${EPREFIX}/usr|g' \ + -e 's|@prefix@|/usr|g' \ -e 's|@exec_prefix@|${prefix}|g' \ -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ @@ -98,7 +98,8 @@ multilib_src_install() { LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ INCLUDE_PATH="${ED}/usr/include" \ SHARED_MODE=1 - insinto /usr/share/pkgconfig + # overwrites zlib.pc created from win32/Makefile.gcc #620136 + insinto /usr/$(get_libdir)/pkgconfig doins zlib.pc ;; |