diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-19 19:09:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-19 19:09:38 +0000 |
| commit | fddb13290fe19ed8311917933d63677713469600 (patch) | |
| tree | a64ccf3032f29dd89b8a14963b8cf9cf99712c6b /sys-libs/zlib | |
| parent | Unmask new armagetro... (diff) | |
| download | gentoo-2-fddb13290fe19ed8311917933d63677713469600.tar.gz gentoo-2-fddb13290fe19ed8311917933d63677713469600.tar.bz2 gentoo-2-fddb13290fe19ed8311917933d63677713469600.zip | |
Fix NLS issues wrt #310225, thanks to Priit Laes for reporting.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch | 24 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.4.ebuild | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 4048f39afa22..5e4601851230 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.73 2010/03/19 02:23:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.74 2010/03/19 19:09:37 ssuominen Exp $ + + 19 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> zlib-1.2.4.ebuild, + +files/zlib-1.2.4-configure-LANG.patch: + Fix NLS issues wrt #310225, thanks to Priit Laes for reporting. 19 Mar 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.4.ebuild: Add to ~arch and block older broken libxml2 versions #309623. 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 new file mode 100644 index 000000000000..542612a1371a --- /dev/null +++ b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch @@ -0,0 +1,24 @@ +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 --git a/sys-libs/zlib/zlib-1.2.4.ebuild b/sys-libs/zlib/zlib-1.2.4.ebuild index c534c17012f1..aa4e579c4692 100644 --- a/sys-libs/zlib/zlib-1.2.4.ebuild +++ b/sys-libs/zlib/zlib-1.2.4.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.4.ebuild,v 1.2 2010/03/19 02:23:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.3 2010/03/19 19:09:37 ssuominen Exp $ inherit eutils toolchain-funcs @@ -23,6 +23,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.2.4-visibility-support.patch #149929 epatch "${FILESDIR}"/${PN}-1.2.4-LDFLAGS.patch #126718 epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212 + epatch "${FILESDIR}"/${PN}-1.2.4-configure-LANG.patch # trust exit status of the compiler rather than stderr #55434 # -if test "`(...) 2>&1`" = ""; then # +if (...) 2>/dev/null; then |