commit: 83da68b1c768ca8c10918dfa287a35b845febaad Author: Marty Plummer <ntzrmtthihu777 <AT> gmail <DOT> com> AuthorDate: Mon May 29 18:42:57 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 30 08:09:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83da68b1
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 sys-libs/zlib/zlib-1.2.11.ebuild | 5 +++-- 1 file 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 b587d42dae1..83ff762d7ec 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 ;;
