[gtk-osx] Fix typo in enchant patch name.



commit c193146bf381ea931aaab3b89693f8e01957bad9
Author: John Ralls <jralls ceridwen us>
Date:   Wed Apr 1 05:06:51 2015 -0700

    Fix typo in enchant patch name.

 jhbuildrc-gtk-osx                             |    7 ++++++-
 modulesets-stable/gtk-osx-unsupported.modules |    5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 6b9344b..0b98740 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -288,11 +288,16 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
 
     #Glib and autoconf-2.63 have issues with endianness
     #
-    if architectures == ["i386"] or architectures == ["x86_64"]:
+    if architectures == ["i386"]:
+        append_autogenargs("glib", "ac_cv_c_bigendian=no")
+        append_autogenargs("openssl", "darwin-i386-cc")
+    elif architectures == ["x86_64"]:
         append_autogenargs("glib", "ac_cv_c_bigendian=no")
+        append_autogenargs("openssl", "darwin-x86_64-cc")
     elif architectures == ["ppc"]:
         append_autogenargs("glib", "ac_cv_c_bigendian=yes")
         append_autogenargs("gmp", 'CFLAGS="-force_cpusubtype_ALL $CFLAGS"')
+        append_autogenargs("openssl", "darwin-ppc-cc")
 
     # For unknown reasons, iconv is not picked up correctly without this
     #
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 7fcff51..e8f86b0 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -91,8 +91,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="openssl" autogen-sh="Configure"
-            autogen-template="%(srcdir)s/Configure --prefix=%(prefix)s  darwin-i386-cc shared"
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
             supports-non-srcdir-builds="no">
     <branch module="openssl-0.9.8ze.tar.gz" version="0.9.8ze" repo="openssl"/>
   </autotools>
@@ -172,7 +171,7 @@
            repo="abisource/enchant">
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch"; strip="1"/>
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-env.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-xdg-pat.patch"; strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-xdg-path.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]