Changeset 79566

Timestamp:

06/18/11 05:56:35 (4 years ago)

Author:

jmr@…

Message:

erlang: Fix the wxWidgets dependency situation. Using the system wx doesn't help because it's still only i386+ppc on 10.6. Not disabling wx when the variant isn't set caused bugs like #25225.

Location:

trunk/dports/lang/erlang

Files:

• Portfile (modified) (4 diffs)
• files/patch-disable_wx.diff (added)

trunk/dports/lang/erlang/Portfile

@@ -63 +63 @@
                 patch-erts_configure.diff \
                 patch-lib_ssl_c_src_esock_openssl.c \
-                patch-lib_wx_configure.in \
-                patch-lib_wx_configure
+                patch-disable_wx.diff
 
 configure.args  --prefix=${prefix}      \
@@ -98 +97 @@
 
 platform darwin 10 {
-    # 10.6 comes with wxWidgets and since it requires libsdl, which
-    # current doesn't compile (bug #20235), we can avoid it here.
-    depends_build-delete    port:wxWidgets
-
     patchfiles-delete       patch-lib_ssl_c_src_esock_openssl.c
     
@@ -111 +106 @@
 }
 
+platform macosx {
+    if {[variant_isset wxwidgets]} {
+        # wxMac is 32-bit only
+        supported_archs i386 ppc
+    }
+}
 platform darwin {
-    if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+    if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
         configure.args-append --enable-darwin-64bit
     }
@@ -118 +119 @@
 
 variant wxwidgets description {Build wxWidgets support} {
-        depends_build-append     port:wxWidgets
+        patchfiles-delete        patch-disable_wx.diff
+        patchfiles-append        patch-lib_wx_configure.in \
+                                 patch-lib_wx_configure
+        depends_lib-append       port:wxWidgets
         depends_run-append       port:tk
 }