diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-20 18:21:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-20 18:21:52 +0000 |
| commit | 8d5c44693109457adc40453786c4b0c1c5eefdeb (patch) | |
| tree | eee7563f56e875ad8dd0040efe572d8c596f0034 /sys-libs | |
| parent | Fix stdbool.h/ppc+altivec issues #305333 by Leo Souza and clean up the build ... (diff) | |
| download | gentoo-2-8d5c44693109457adc40453786c4b0c1c5eefdeb.tar.gz gentoo-2-8d5c44693109457adc40453786c4b0c1c5eefdeb.tar.bz2 gentoo-2-8d5c44693109457adc40453786c4b0c1c5eefdeb.zip | |
Use upstream patch instead.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch | 44 |
2 files changed, 25 insertions, 25 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 5e4601851230..05d054146786 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.74 2010/03/19 19:09:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.75 2010/03/20 18:21:51 ssuominen Exp $ + + 20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + files/zlib-1.2.4-configure-LANG.patch: + Use upstream patch instead. 19 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> zlib-1.2.4.ebuild, +files/zlib-1.2.4-configure-LANG.patch: diff --git a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch index 542612a1371a..b1c280665325 100644 --- a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch +++ b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch @@ -1,24 +1,20 @@ -http://bugs.gentoo.org/show_bug.cgi?id=310225 - ---- configure -+++ configure -@@ -9,6 +9,19 @@ - # or for csh/tcsh users: - # (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) - -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ unset $as_var -+ fi -+done -+ - # Incorrect settings of CC or CFLAGS may prevent creating a shared library. - # If you have problems, try without defining CC and CFLAGS before reporting - # an error. +diff -ur zlib-1.2.4.orig/configure zlib-1.2.4/configure +--- zlib-1.2.4.orig/configure 2010-03-12 17:06:14.000000000 +0200 ++++ zlib-1.2.4/configure 2010-03-20 19:25:26.000000000 +0200 +@@ -43,11 +43,11 @@ + echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' + echo ' [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' + exit 0 ;; +- -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; +- -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;; +- -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;; ++ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;; ++ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;; ++ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;; ++ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;; ++ -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;; + -p* | --prefix) prefix="$2"; shift; shift ;; + -e* | --eprefix) exec_prefix="$2"; shift; shift ;; + -l* | --libdir) libdir="$2"; shift; shift ;; |