[50387] trunk/dports/textproc/libiconv/Portfile

mcalhoun at macports.org mcalhoun at macports.org
Wed Apr 29 19:22:26 PDT 2009


Revision: 50387
          http://trac.macports.org/changeset/50387
Author:   mcalhoun at macports.org
Date:     2009-04-29 19:22:25 -0700 (Wed, 29 Apr 2009)
Log Message:
-----------
libiconv: Correct values guessed by configure script during universal builds.
Fixes #18440.

Modified Paths:
--------------
    trunk/dports/textproc/libiconv/Portfile

Modified: trunk/dports/textproc/libiconv/Portfile
===================================================================
--- trunk/dports/textproc/libiconv/Portfile	2009-04-30 02:02:47 UTC (rev 50386)
+++ trunk/dports/textproc/libiconv/Portfile	2009-04-30 02:22:25 UTC (rev 50387)
@@ -94,4 +94,35 @@
     }
 }
 
+if { [variant_isset universal] } {
+    # When cross-compiling, can guess wrong endian value.
+    if { ${os.arch}=="i386" } {
+        if { ${os.major} >= 10 } {
+            lappend merger_configure_env(ppc) cl_cv_sys_endian='big endian'
+            set cross_archs "ppc ppc64"
+        }
+        lappend merger_configure_env(ppc64)   cl_cv_sys_endian='big endian'
+        set cross_archs "ppc64"
+    } else {
+        lappend merger_configure_env(i386)    cl_cv_sys_endian='little endian'
+        lappend merger_configure_env(x86_64)  cl_cv_sys_endian='little endian'
+        set cross_archs "i386 x86_64"
+    }
+
+    foreach arch ${cross_archs} {
+        lappend merger_configure_env(${arch}) \
+            ac_cv_func_malloc_0_nonnull='yes' \
+            gl_cv_func_malloc_0_nonnull='1'
+    }
+
+    # See http://trac.macports.org/ticket/18440.
+    if { ${universal_sysroot}=="/Developer/SDKs/MacOSX10.4u.sdk" } {
+            foreach arch "ppc64 x86_64" {
+                lappend merger_configure_env(${arch}) \
+                    am_cv_func_iconv='yes' \
+                    am_cv_proto_iconv_arg1='const'
+        }
+    }
+}
+
 livecheck.check         freshmeat
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090429/e7227dd5/attachment.html>


More information about the macports-changes mailing list