Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 351562 Details for
Bug 457134
app-arch/bzip2, sys-libs/zlib: please discuss the possibility of introducing multilib-build.eclass support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Diff between zlib ebuilds
zlib.diff (text/plain), 3.63 KB, created by
Pacho Ramos
on 2013-06-21 16:21:45 UTC
(
hide
)
Description:
Diff between zlib ebuilds
Filename:
MIME Type:
Creator:
Pacho Ramos
Created:
2013-06-21 16:21:45 UTC
Size:
3.63 KB
patch
obsolete
>--- /home/pacho/gentoo-x86/sys-libs/zlib/zlib-1.2.8.ebuild 2013-06-21 13:05:27.000000000 +0200 >+++ /usr/portage/sys-libs/zlib/zlib-1.2.8.ebuild 2013-06-21 12:47:46.000000000 +0200 >@@ -2,8 +2,10 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8.ebuild,v 1.2 2013/06/17 02:33:13 vapier Exp $ > >+EAPI=4 > AUTOTOOLS_AUTO_DEPEND="no" >-inherit autotools toolchain-funcs multilib >+ >+inherit autotools toolchain-funcs multilib multilib-minimal > > DESCRIPTION="Standard (de)compression library" > HOMEPAGE="http://www.zlib.net/" >@@ -17,33 +19,26 @@ > IUSE="minizip static-libs" > > DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" >-RDEPEND="!<dev-libs/libxml2-2.7.7" #309623 >- >-src_unpack() { >- unpack ${A} >- cd "${S}" >+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 ) >+ !<dev-libs/libxml2-2.7.7" #309623 > >+src_prepare() { > if use minizip ; then >- cd contrib/minizip >+ cd contrib/minizip || die > eautoreconf > fi >+ >+ multilib_copy_sources > } > > echoit() { echo "$@"; "$@"; } >-src_compile() { >+ >+multilib_src_configure() { > case ${CHOST} in > *-mingw*|mingw*) >- 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 >+ true > ;; >- *) # not an autoconf script, so can't use econf >+ *) # not an autoconf script, so can't use econf > local uname=$(/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 > echoit ./configure \ > --shared \ >@@ -51,13 +46,35 @@ > --libdir=/usr/$(get_libdir) \ > ${uname:+--uname=${uname}} \ > || die >- emake || die > ;; > esac >+ > if use minizip ; then >- cd contrib/minizip >+ cd contrib/minizip || die > econf $(use_enable static-libs static) >- emake || die >+ fi >+} >+ >+multilib_src_compile() { >+ case ${CHOST} in >+ *-mingw*|mingw*) >+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- >+ 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 >+ ;; >+ *) >+ emake >+ ;; >+ esac >+ if use minizip ; then >+ cd contrib/minizip || die >+ emake > fi > } > >@@ -66,34 +83,40 @@ > # we do it here so we only have to tweak 2 files > sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die > } >-src_install() { >+ >+multilib_src_install() { > case ${CHOST} in > *-mingw*|mingw*) > 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 >+ SHARED_MODE=1 > insinto /usr/share/pkgconfig >- doins zlib.pc || die >+ doins zlib.pc > ;; > > *) >- emake install DESTDIR="${D}" LDCONFIG=: || die >+ emake install DESTDIR="${D}" LDCONFIG=: > gen_usr_ldscript -a z > ;; > esac > sed_macros "${D}"/usr/include/*.h > >- dodoc FAQ README ChangeLog doc/*.txt >- > if use minizip ; then >- cd contrib/minizip >- emake install DESTDIR="${D}" || die >+ cd contrib/minizip || die >+ emake install DESTDIR="${D}" > sed_macros "${D}"/usr/include/minizip/*.h >- dodoc *.txt > fi > > use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645 > } >+ >+multilib_src_install_all() { >+ dodoc FAQ README ChangeLog doc/*.txt >+ >+ if use minizip; then >+ cd contrib/minizip || die >+ dodoc *.txt >+ fi >+}
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 Raw
Actions:
View
Attachments on
bug 457134
:
350984
|
351514
|
351516
|
351532
|
351560
|
351562
|
351564
|
351568
|
351594
|
351598