Darwin pass 2

1 files changed, 14 insertions, 7 deletions

diff --git a/hstcal/build.sh b/hstcal/build.sh
index 0e9f496..a83dff8 100644
--- a/hstcal/build.sh
+++ b/hstcal/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 name=hstcal
-version=2.3.1
+version=2.3.2
 revision=0
 sources=()
 build_depends=(
@@ -12,7 +12,7 @@ depends=(
     "cfitsio"
 )
 
-_waf_version=2.0.18
+_waf_version=2.0.20
 
 function prepare() {
     curl -L https://waf.io/waf-${_waf_version} > waf
@@ -20,17 +20,24 @@ function prepare() {
 
     git clone https://github.com/spacetelescope/${name}
     cd ${name}
-    git checkout ${version}
+
+    if [[ $(uname -s) == Darwin ]]; then
+        CC="${_runtime}/bin/gcc"
+        LDFLAGS="-L${_runtime}/lib"
+
+        export CC
+    fi
+
+    cp wscript ../wscript.orig
+    sed -E 's|platform.popen(.*)\.read\(\)|call\1|' ../wscript.orig > wscript
 }
 
 function build() {
-    ../waf configure --prefix=${_prefix}
-echo debug
-bash
+   ./waf configure --prefix="${_prefix}"
 }
 
 function package() {
-    ../waf install --destdir="${_pkgdir}"
+    ./waf install --destdir="${_pkgdir}"
 }