diff options
| author | René de Hesselle <dehesselle@web.de> | 2019-09-09 14:08:53 +0000 |
|---|---|---|
| committer | René de Hesselle <dehesselle@web.de> | 2019-09-09 14:08:53 +0000 |
| commit | 291a27405559f0f6dcc3d0a6aa209acef458a152 (patch) | |
| tree | 9709368041bd70c02422927917c5a1add55e630b /packaging/macos/120-python3.sh | |
| parent | 1.0 beta release (diff) | |
| download | inkscape-291a27405559f0f6dcc3d0a6aa209acef458a152.tar.gz inkscape-291a27405559f0f6dcc3d0a6aa209acef458a152.zip | |
Change build OS and target
We no longer user El Capitan (10.11) as build platform. We now use
Mojave (10.14) in combination with the Mavericks SDK (10.9). This
simplifies the build process as we can use a current platform
and gives backward compatibility down to Mavericks (10.9).
Use a newer Python build that we turn non-relocatable for JHBuild,
avoiding to build it ourselves (time consuming!) in 120-python3.sh.
New default build location is /Users/Shared/work. This is a user-
independent location and user-writable and simplifies WKR_DIR
handling.
Diffstat (limited to 'packaging/macos/120-python3.sh')
| -rwxr-xr-x | packaging/macos/120-python3.sh | 15 |
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 |