casa / casa-mp-base / a2b2e1a66dd

Commits

Christopher Chavez authored and Frank Schima committed a2b2e1a66dd 24 Jun 2019

jack: remove old conflict handler

Was added in a4e16dbb04 over one year ago.

Modified

-49
+                    --opus=no \
-50
+                    --samplerate=yes \
-51
+                    --sndfile=yes \
-52
+                    --readline=no
-53
-54
+platform darwin {
-55
+    if {[string match *clang* ${configure.compiler}]} {
-56
+        configure.ldflags-append -stdlib=${configure.cxx_stdlib}
-57
+    }
-58
+}
--
--
+# deactivate hack added 2018-04-06
--
+pre-configure {
--
+    # When upgrading from jack1 to jack2, the build can fail outside of trace
--
+    # mode because waf puts the CPPFLAGS at the beginning of the compiler
--
+    # command line. This was fixed in waf 1.9.0, but jack2 ships waf 1.8.17.
--
+    #
--
+    # Instead of using the conflicts-build portgroup, use a deactivate hack to
--
+    # force-deactive the old version before building, which should solve the
--
+    # issue.
--
+    if {![catch {set installed [lindex [registry_active jack] 0]}]} {
--
+        elevateToRoot "deactivate jack1"
--
+        set _version [lindex $installed 1]
--
+        if {[vercmp $_version 1.9.12] < 0} {
--
+            # 1.9.12 is the first version of jack2 packaged in MacPorts
--
+            registry_deactivate_composite jack "" [list ports_nodepcheck 1]
--
+        }
--
+        dropPrivileges
--
+    }
--
+}