[vlc-commits] contrib/iconv: enable the Android patch for iOS as well and rename it to ' -android-ios'

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jul 26 22:30:23 2012 -0300| [28c8ae0331ba48d9e459ed1b31eeb18c8ce09b33] | committer: Felix Paul Kühne

contrib/iconv: enable the Android patch for iOS as well and rename it to '-android-ios'

We need to check whether we would like to apply this patch by default on OS X and Windows, too.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=28c8ae0331ba48d9e459ed1b31eeb18c8ce09b33
---

 .../iconv/{libiconv-android.patch => libiconv-android-ios.patch}  |    0
 contrib/src/iconv/rules.mak                                       |    5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/iconv/libiconv-android.patch b/contrib/src/iconv/libiconv-android-ios.patch
similarity index 100%
rename from contrib/src/iconv/libiconv-android.patch
rename to contrib/src/iconv/libiconv-android-ios.patch
diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index ed615b7..dbf10f7 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -24,7 +24,10 @@ ifdef HAVE_WINCE
 	$(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
 endif
 ifdef HAVE_ANDROID
-	$(APPLY) $(SRC)/iconv/libiconv-android.patch
+	$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
+endif
+ifdef HAVE_IOS
+	$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
 endif
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux