[gtk-osx] Remove iconv from bootstrap
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Remove iconv from bootstrap
- Date: Fri, 17 Aug 2012 20:17:59 +0000 (UTC)
commit 60551a31c2f4338132f96fbc32355eb57321205d
Author: Christophe Fergeau <cfergeau redhat com>
Date: Fri Aug 17 17:40:27 2012 +0200
Remove iconv from bootstrap
On recent OSX versions, building libiconv will get in the way of
the system one when trying to generate a bundle, and this will
cause runtime failures. Since the native iconv is good enough for
use by the gtk+ stack, we can remove GNU iconv from bootstrap.
modulesets-stable/bootstrap.modules | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 406b508..9e5960a 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -44,11 +44,6 @@
</dependencies>
</autotools>
- <autotools id='libiconv' autogen-sh='configure'>
- <branch module="libiconv/libiconv-1.13.1.tar.gz" version="1.1.3.1"
- repo="ftp.gnu.org"/>
- </autotools>
-
<autotools id="gettext" autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp">
<branch repo="ftp.gnu.org"
@@ -56,9 +51,6 @@
size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch" strip="1"/>
</branch>
- <dependencies>
- <dep package="libiconv"/>
- </dependencies>
</autotools>
<autotools id='readline' >
@@ -130,7 +122,7 @@
<dep package="xz"/>
<dep package="make"/> <!-- Needed for Tiger, skipped otherwise -->
<dep package="subversion"/> <!-- Needed for Tiger, skipped otherwise -->
- <dep package="gettext" /> <!-- Pulls in libiconv, needed for 64-bit -->
+ <dep package="gettext" /> <!-- Needed for 64-bit -->
<dep package="m4"/> <!-- Can be skipped for Leopard and later -->
<dep package="autoconf" />
<dep package="libtool" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]