* [gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.4-configure-LANG.patch
@ 2010-03-19 19:09 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-19 19:09 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/19 19:09:39
Added: zlib-1.2.4-configure-LANG.patch
Log:
Fix NLS issues wrt #310225, thanks to Priit Laes for reporting.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.1&content-type=text/plain
Index: zlib-1.2.4-configure-LANG.patch
===================================================================
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.4-configure-LANG.patch
@ 2010-03-20 18:21 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-20 18:21 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/20 18:21:53
Modified: zlib-1.2.4-configure-LANG.patch
Log:
Use upstream patch instead.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?r1=1.1&r2=1.2
Index: zlib-1.2.4-configure-LANG.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zlib-1.2.4-configure-LANG.patch 19 Mar 2010 19:09:38 -0000 1.1
+++ zlib-1.2.4-configure-LANG.patch 20 Mar 2010 18:21:52 -0000 1.2
@@ -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 ;;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.4-configure-LANG.patch
@ 2010-03-20 18:24 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-20 18:24 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/20 18:24:03
Modified: zlib-1.2.4-configure-LANG.patch
Log:
Missing link in patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch?r1=1.2&r2=1.3
Index: zlib-1.2.4-configure-LANG.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zlib-1.2.4-configure-LANG.patch 20 Mar 2010 18:21:52 -0000 1.2
+++ zlib-1.2.4-configure-LANG.patch 20 Mar 2010 18:24:02 -0000 1.3
@@ -1,6 +1,7 @@
-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
+http://bugs.gentoo.org/310225
+
+--- configure
++++ configure
@@ -43,11 +43,11 @@
echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]'
echo ' [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-20 18:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-20 18:21 [gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.4-configure-LANG.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2010-03-20 18:24 Samuli Suominen (ssuominen)
2010-03-19 19:09 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox