summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-05-01 11:02:10 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-05-01 11:02:10 +0000
commitb82e46354d290a02f94ea03c20bcb4f930eb4865 (patch)
treef89e3819356581f195047623627502995570e632
parentVersion bump for series two, it still causes problems but is needed for some ... (diff)
downloadgentoo-2-b82e46354d290a02f94ea03c20bcb4f930eb4865.tar.gz
gentoo-2-b82e46354d290a02f94ea03c20bcb4f930eb4865.tar.bz2
gentoo-2-b82e46354d290a02f94ea03c20bcb4f930eb4865.zip
add a small patch to recognize freebsd chosts too, bug #316841
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--sys-libs/zlib/ChangeLog6
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch11
-rw-r--r--sys-libs/zlib/zlib-1.2.5-r2.ebuild4
3 files changed, 19 insertions, 2 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index e39e92e9e8d3..cdd012c96e80 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/zlib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.80 2010/04/29 17:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.81 2010/05/01 11:02:10 aballier Exp $
+
+ 01 May 2010; Alexis Ballier <aballier@gentoo.org> zlib-1.2.5-r2.ebuild,
+ +files/zlib-1.2.5-fbsd_chosts.patch:
+ add a small patch to recognize freebsd chosts too, bug #316841
*zlib-1.2.5-r2 (29 Apr 2010)
diff --git a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
new file mode 100644
index 000000000000..9a37f7488bc5
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
@@ -0,0 +1,11 @@
+--- zlib-1.2.5/configure.in 2010-05-01 12:45:30.000000000 +0200
++++ zlib-1.2.5/configure 2010-05-01 12:45:55.000000000 +0200
+@@ -118,7 +118,7 @@
+ uname=`(uname -s || echo unknown) 2>/dev/null`
+ fi
+ case "$uname" in
+- Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
++ Linux* | linux* | GNU | GNU/* | *BSD | DragonFly | freebsd* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
+ CYGWIN* | Cygwin* | cygwin* | OS/2*)
+ EXE='.exe' ;;
+ MINGW*|mingw*)
diff --git a/sys-libs/zlib/zlib-1.2.5-r2.ebuild b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
index f42f8cb7a903..ccf962254c33 100644
--- a/sys-libs/zlib/zlib-1.2.5-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/04/29 17:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.2 2010/05/01 11:02:10 aballier Exp $
inherit eutils toolchain-funcs
@@ -27,6 +27,8 @@ src_unpack() {
# bug #316377
epatch "${FILESDIR}"/${P}-lfs-decls.patch
+ # bug #316841
+ epatch "${FILESDIR}"/${P}-fbsd_chosts.patch
}
src_compile() {