diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-21 21:18:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-21 21:18:15 +0000 |
| commit | 6d10015a280c4b597432a37a34307e860a708423 (patch) | |
| tree | 8e665c9cc8b5eef2b83bc1eebbbe47fcdd4fa424 /sys-libs | |
| parent | zlib-1.2.5 fix (bug #384019); more use flags for libsdl (diff) | |
| download | gentoo-2-6d10015a280c4b597432a37a34307e860a708423.tar.gz gentoo-2-6d10015a280c4b597432a37a34307e860a708423.tar.bz2 gentoo-2-6d10015a280c4b597432a37a34307e860a708423.zip | |
Also rename macros in new minizip headers.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.5.1-r2.ebuild | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 11fae272abf7..e40d59564d0a 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/zlib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.95 2011/09/21 19:36:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.96 2011/09/21 21:18:15 vapier Exp $ + + 21 Sep 2011; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5.1-r2.ebuild: + Also rename macros in new minizip headers. *zlib-1.2.5.1-r2 (21 Sep 2011) diff --git a/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild b/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild index 4d8fbc704173..e01908921581 100644 --- a/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild +++ b/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild,v 1.1 2011/09/21 19:36:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild,v 1.2 2011/09/21 21:18:15 vapier Exp $ inherit autotools eutils toolchain-funcs @@ -62,6 +62,11 @@ src_compile() { fi } +sed_macros() { + # clean up namespace a little #383179 + # we do it here so we only have to tweak 2 files + sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die +} src_install() { case ${CHOST} in *-mingw*|mingw*) @@ -78,18 +83,16 @@ src_install() { *) emake install DESTDIR="${D}" LDCONFIG=: || die gen_usr_ldscript -a z + sed_macros "${D}"/usr/include/*.h ;; esac - # clean up namespace a little #383179 - # we do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "${D}"/usr/include/*.h - dodoc FAQ README ChangeLog doc/*.txt if use minizip ; then cd contrib/minizip emake install DESTDIR="${D}" || die + sed_macros "${D}"/usr/include/minizip/*.h dodoc *.txt fi |