Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 228565 Details for
Bug 310307
sys-libs/zlib has broken CHOST=mingw32 support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
zlib-1.2.5.ebuild.diff
zlib-1.2.5.ebuild.diff (text/plain), 1.77 KB, created by
Alon Bar-Lev
on 2010-04-20 22:30:44 UTC
(
hide
)
Description:
zlib-1.2.5.ebuild.diff
Filename:
MIME Type:
Creator:
Alon Bar-Lev
Created:
2010-04-20 22:30:44 UTC
Size:
1.77 KB
patch
obsolete
>--- zlib-1.2.5.ebuild.org 2010-04-20 23:43:56.551365842 +0300 >+++ zlib-1.2.5.ebuild 2010-04-21 01:29:17.924433992 +0300 >@@ -19,7 +19,6 @@ RDEPEND="!<dev-libs/libxml2-2.7.7" #3096 > src_unpack() { > unpack ${A} > cd "${S}" >- epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212 > # trust exit status of the compiler rather than stderr #55434 > # -if test "`(...) 2>&1`" = ""; then > # +if (...) 2>/dev/null; then >@@ -29,9 +28,17 @@ src_unpack() { > src_compile() { > case ${CHOST} in > *-mingw*|mingw*) >- emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die >+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die >+ sed \ >+ -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' \ >+ -e 's|@includedir@|${prefix}/include|g' \ >+ -e 's|@VERSION@|'${PV}'|g' \ >+ zlib.pc.in > zlib.pc || die > ;; >- *) # not an autoconf script, so cant use econf >+ *) # not an autoconf script, so can't use econf > ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die > emake || die > ;; >@@ -39,14 +46,23 @@ src_compile() { > } > > src_install() { >- emake install DESTDIR="${D}" LDCONFIG=: || die >- dodoc FAQ README ChangeLog doc/*.txt >- > case ${CHOST} in > *-mingw*|mingw*) >- dobin zlib1.dll || die >- dolib libz.dll.a || die >+ emake -f win32/Makefile.gcc install \ >+ BINARY_PATH="${D}/usr/bin" \ >+ LIBRARY_PATH="${D}/usr/$(get_libdir)" \ >+ INCLUDE_PATH="${D}/usr/include" \ >+ SHARED_MODE=1 \ >+ || die >+ insinto /usr/$(get_libdir)/pkgconfig >+ doins zlib.pc || die >+ ;; >+ >+ *) >+ emake install DESTDIR="${D}" LDCONFIG=: || die >+ gen_usr_ldscript -a z > ;; >- *) gen_usr_ldscript -a z ;; > esac >+ >+ dodoc FAQ README ChangeLog doc/*.txt > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 310307
:
224305
|
228553
|
228555
|
228559
| 228565