raxml: respect MacPorts settings & Xcode workaround

macports · May 20, 2020 · 23acba4 · 23acba4
1 parent 469daed
commit 23acba4
Show file tree

Hide file tree

Showing 3 changed files with 385 additions and 123 deletions.
diff --git a/science/raxml/Portfile b/science/raxml/Portfile
@@ -3,9 +3,11 @@
 PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           mpi 1.0
+PortGroup           xcode_workaround 1.0
+PortGroup           makefile 1.0
 
 github.setup        stamatak standard-RAxML 7.7.6 v
-revision            1
+revision            2
 checksums           sha256  7562b307bc50e38162f104271793a1c8f98f866c2342bea21afe6df6a982fd82 \
                     rmd160  da76d6623515b7d8f78a69aaf4eec713508789af
 name                raxml
@@ -22,7 +24,8 @@ platforms           darwin
 compilers.choose    cc
 mpi.setup
 
-use_configure       no
+# respect MacPorts settings
+patchfiles-append   patch-Makefiles.diff
 
 #Strings used by the variant options
 set HPCm ""
@@ -94,7 +97,6 @@ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
 #Make sure we are using the correct Makefile for this variant combo
 pre-build {
     build.pre_args      -f Makefile${EXTm}${HPCm}.gcc
-    build.args-append   CC="${configure.cc}"
 }
 
 #We only need the single raxml binary

diff --git a/science/raxml/files/Makefiles.patch b/science/raxml/files/Makefiles.patch