summaryrefslogtreecommitdiffstats
path: root/packaging/macos/120-python3.sh
diff options
context:
space:
mode:
authorRené de Hesselle <dehesselle@web.de>2019-09-09 15:25:32 +0000
committerRené de Hesselle <dehesselle@web.de>2019-09-09 15:25:32 +0000
commit93e910a632255de36ddfb38bf1d741ce2350c649 (patch)
tree5564643b61ed8e10cf69d2aa019ff749c4d02df1 /packaging/macos/120-python3.sh
parentFix block progression icon issues pointed by Tav in rocket (diff)
parentChange build OS and target (diff)
downloadinkscape-93e910a632255de36ddfb38bf1d741ce2350c649.tar.gz
inkscape-93e910a632255de36ddfb38bf1d741ce2350c649.zip
Merge updated macOS build system
Diffstat (limited to 'packaging/macos/120-python3.sh')
-rwxr-xr-xpackaging/macos/120-python3.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/packaging/macos/120-python3.sh b/packaging/macos/120-python3.sh
index 5dbbda27b..3d5b31528 100755
--- a/packaging/macos/120-python3.sh
+++ b/packaging/macos/120-python3.sh
@@ -16,16 +16,17 @@ run_annotated
### install Python 3 ###########################################################
-get_source $URL_PYTHON3_SRC
+get_source $URL_PYTHON36_BIN $WRK_DIR
+get_source $URL_PYTHON36_SRC
+sed -i "" "/^WRK_DIR/s/.*/WRK_DIR=$(escape_sed $WRK_DIR)/" 020-vars.sh
sed -i "" '/^FRA_DIR/s/.*/FRA_DIR=$WRK_DIR/' 020-vars.sh
-./110-build.sh
-./310-package-fixed.sh
+# Using the relocatable version of the framework as starting point,
+# we're going to turn the link paths into fixed (non-relocatable) ones.
+grep -v "cp " 310-package-fixed.sh > 311-package-fixed-nocp.sh
+chmod 755 311-package-fixed-nocp.sh
+./311-package-fixed-nocp.sh
-cd $SELF_DIR
-rm -rf $OPT_DIR
-mkdir -p $BIN_DIR
-mkdir -p $TMP_DIR
ln -sf $WRK_DIR/Python.framework/Versions/Current/bin/python3 $BIN_DIR