| 1 |
vapier 08/05/02 04:13:33 |
| 2 |
|
| 3 |
Modified: zlib-1.2.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fixes from kerzol for mingw targets #182903. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 sys-libs/zlib/zlib-1.2.3-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: zlib-1.2.3-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- zlib-1.2.3-r1.ebuild 14 May 2007 23:51:14 -0000 1.12 |
| 22 |
+++ zlib-1.2.3-r1.ebuild 2 May 2008 04:13:33 -0000 1.13 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild,v 1.12 2007/05/14 23:51:14 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild,v 1.13 2008/05/02 04:13:33 vapier Exp $ |
| 29 |
|
| 30 |
inherit eutils flag-o-matic toolchain-funcs |
| 31 |
|
| 32 |
@@ -19,24 +19,30 @@ |
| 33 |
src_unpack() { |
| 34 |
unpack ${A} |
| 35 |
cd "${S}" |
| 36 |
+ epatch "${FILESDIR}"/${P}-build.patch |
| 37 |
epatch "${FILESDIR}"/${P}-visibility-support.patch #149929 |
| 38 |
- # Make sure we link with glibc at all times |
| 39 |
epatch "${FILESDIR}"/${PN}-1.2.1-glibc.patch |
| 40 |
- # Needed for Alpha and prelink |
| 41 |
epatch "${FILESDIR}"/${PN}-1.2.1-build-fPIC.patch |
| 42 |
epatch "${FILESDIR}"/${PN}-1.2.1-configure.patch #55434 |
| 43 |
- # fix shared library test on -fPIC dependant archs |
| 44 |
epatch "${FILESDIR}"/${PN}-1.2.1-fPIC.patch |
| 45 |
epatch "${FILESDIR}"/${PN}-1.2.3-r1-bsd-soname.patch #123571 |
| 46 |
epatch "${FILESDIR}"/${PN}-1.2.3-LDFLAGS.patch #126718 |
| 47 |
- sed -i -e '/ldconfig/d' Makefile.in |
| 48 |
+ sed -i -e '/ldconfig/d' Makefile* |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
- tc-export CC RANLIB |
| 53 |
- export AR="$(tc-getAR) rc" |
| 54 |
- ./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die |
| 55 |
- emake || die |
| 56 |
+ tc-export AR CC RANLIB |
| 57 |
+ case ${CHOST} in |
| 58 |
+ *-mingw*|mingw*) |
| 59 |
+ export RC=${CHOST}-windres DLLWRAP=${CHOST}-dllwrap |
| 60 |
+ emake -f win32/Makefile.gcc prefix=/usr || die |
| 61 |
+ ;; |
| 62 |
+ *) |
| 63 |
+ # not an autoconf script, so cant use econf |
| 64 |
+ ./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die |
| 65 |
+ emake || die |
| 66 |
+ ;; |
| 67 |
+ esac |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
| 71 |
@@ -46,9 +52,7 @@ |
| 72 |
doins zconf.h zlib.h |
| 73 |
|
| 74 |
doman zlib.3 |
| 75 |
- dodoc FAQ README ChangeLog |
| 76 |
- docinto txt |
| 77 |
- dodoc algorithm.txt |
| 78 |
+ dodoc FAQ README ChangeLog algorithm.txt |
| 79 |
|
| 80 |
# we don't need the static lib in /lib |
| 81 |
# as it's only for compiling against |
| 82 |
@@ -56,10 +60,17 @@ |
| 83 |
|
| 84 |
# all the shared libs go into /lib |
| 85 |
# for NFS based /usr |
| 86 |
- into / |
| 87 |
- dolib libz.so.${PV} |
| 88 |
- ( cd "${D}"/$(get_libdir) ; chmod 755 libz.so.* ) |
| 89 |
- dosym libz.so.${PV} /$(get_libdir)/libz.so |
| 90 |
- dosym libz.so.${PV} /$(get_libdir)/libz.so.1 |
| 91 |
- gen_usr_ldscript libz.so |
| 92 |
+ case ${CHOST} in |
| 93 |
+ *-mingw*|mingw*) |
| 94 |
+ dolib zlib1.dll libzdll.a || die |
| 95 |
+ ;; |
| 96 |
+ *) |
| 97 |
+ into / |
| 98 |
+ dolib libz.so.${PV} |
| 99 |
+ ( cd "${D}"/$(get_libdir) ; chmod 755 libz.so.* ) |
| 100 |
+ dosym libz.so.${PV} /$(get_libdir)/libz.so |
| 101 |
+ dosym libz.so.${PV} /$(get_libdir)/libz.so.1 |
| 102 |
+ gen_usr_ldscript libz.so |
| 103 |
+ ;; |
| 104 |
+ esac |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.70 sys-libs/zlib/ChangeLog |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.70&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.70&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?r1=1.69&r2=1.70 |
| 114 |
|
| 115 |
Index: ChangeLog |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v |
| 118 |
retrieving revision 1.69 |
| 119 |
retrieving revision 1.70 |
| 120 |
diff -u -r1.69 -r1.70 |
| 121 |
--- ChangeLog 12 May 2007 09:15:08 -0000 1.69 |
| 122 |
+++ ChangeLog 2 May 2008 04:13:33 -0000 1.70 |
| 123 |
@@ -1,6 +1,10 @@ |
| 124 |
# ChangeLog for sys-libs/zlib |
| 125 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.69 2007/05/12 09:15:08 kumba Exp $ |
| 127 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 128 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.70 2008/05/02 04:13:33 vapier Exp $ |
| 129 |
+ |
| 130 |
+ 02 May 2008; Mike Frysinger <vapier@g.o> |
| 131 |
+ +files/zlib-1.2.3-build.patch, zlib-1.2.3-r1.ebuild: |
| 132 |
+ Fixes from kerzol for mingw targets #182903. |
| 133 |
|
| 134 |
12 May 2007; Joshua Kinard <kumba@g.o> zlib-1.2.3-r1.ebuild: |
| 135 |
Stable on mips. |
| 136 |
|
| 137 |
|
| 138 |
|
| 139 |
-- |
| 140 |
gentoo-commits@l.g.o mailing list |
Archives