Commit 055bd993 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Update libiconv to latest release...

The enormous mac patch is discarded. But we couldn't stay with such an old version anyway.
parent 40d06d44
...@@ -401,13 +401,9 @@ libiconv-$(LIBICONV_VERSION).tar.gz: ...@@ -401,13 +401,9 @@ libiconv-$(LIBICONV_VERSION).tar.gz:
libiconv: libiconv-$(LIBICONV_VERSION).tar.gz libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS
patch -p0 < Patches/libiconv.patch
endif
ifdef HAVE_WIN64 ifdef HAVE_WIN64
patch -p0 < Patches/libiconv-win64.patch patch -p0 < Patches/libiconv-win64.patch
endif endif
patch -p0 < Patches/libiconv-autoconf-uclibc.patch
libiconv-snowleopard.tar.bz2: libiconv-snowleopard.tar.bz2:
$(WGET) $(LIBICONVMAC_URL) $(WGET) $(LIBICONVMAC_URL)
......
--- libiconv/autoconf/config.sub.orig 2007-05-14 14:14:12.000000000 +0200
+++ libiconv/autoconf/config.sub 2007-05-14 14:17:36.000000000 +0200
@@ -1102,6 +1102,9 @@
-unixware*)
os=-sysv4.2uw
;;
+ -uclibc*)
+ os=-linux
+ ;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
--- libiconv/libcharset/autoconf/config.sub.orig 2007-05-14 14:34:11.000000000 +0200
+++ libiconv/libcharset/autoconf/config.sub 2007-05-14 14:35:09.000000000 +0200
@@ -1102,6 +1102,9 @@
-unixware*)
os=-sysv4.2uw
;;
+ -uclibc*)
+ os=-linux
+ ;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -45,7 +45,7 @@ AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz ...@@ -45,7 +45,7 @@ AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
PKGCFG_VERSION=0.20 PKGCFG_VERSION=0.20
PKGCFG_URL=$(VIDEOLAN)/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz PKGCFG_URL=$(VIDEOLAN)/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz
#PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION).tar.gz #PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION).tar.gz
LIBICONV_VERSION=1.9.2 LIBICONV_VERSION=1.13.1
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
LIBICONVMAC_URL=$(VIDEOLAN)/testing/contrib/libiconv-snowleopard.tar.bz2 LIBICONVMAC_URL=$(VIDEOLAN)/testing/contrib/libiconv-snowleopard.tar.bz2
GETTEXT_VERSION=0.17 GETTEXT_VERSION=0.17
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment