diff options
author | Pete Batard <pete@akeo.ie> | 2012-01-08 19:52:55 +0000 |
---|---|---|
committer | Pete Batard <pete@akeo.ie> | 2012-01-08 19:52:55 +0000 |
commit | 214507c5d94458a841bcab2ddc8c75d762b05d6a (patch) | |
tree | 0610060b66fa00190e046feeee0c05bab52bcbaf | |
parent | 7bc424c1a93de15e13174187a8009be647890d67 (diff) | |
download | libusb-214507c5d94458a841bcab2ddc8c75d762b05d6a.tar.gz |
[revert] revert Chinese NLS libtool patch
* see r265 = b7c99f781f34103174b368dd22502b56c572be0c
* more than 18 months have elapsed since the fix has
been integrated in libtool => most people should have
upgraded by now
-rwxr-xr-x | autogen.sh | 5 | ||||
-rw-r--r-- | libtool-nls.diff | 22 |
2 files changed, 0 insertions, 27 deletions
@@ -27,11 +27,6 @@ create_def() (glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize || LIBTOOLIZE=libtoolize $LIBTOOLIZE --copy --force || exit 1 -# If available, apply libtool's NLS patch to set locale to C always. -# Prevents an issue when compiling shared libs with MinGW on Chinese locale. -# see: http://lists.gnu.org/archive/html/bug-libtool/2010-03/msg00012.html -type -P patch &>/dev/null && { if [ -e "libtool-nls.diff" ]; then patch -p1 -Nl -i libtool-nls.diff &>/dev/null; fi; } -# aclocal || exit 1 autoheader || exit 1 autoconf || exit 1 diff --git a/libtool-nls.diff b/libtool-nls.diff deleted file mode 100644 index d41b733..0000000 --- a/libtool-nls.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -105,9 +105,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -120,6 +117,9 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - |