Dealing with load paths.

Author: culler

Sage_base/sage/tcltk/build_tcltk.sh

@@ -36,6 +36,7 @@ fi
 
 pushd Tcl/unix
 ./configure \
+    ZIPFS_BUILD=0 \
     CFLAGS=-mmacosx-version-min=10.13 \
     --prefix ${INSTALL_PREFIX}\
     --disable-zipfs
@@ -44,6 +45,7 @@ popd
 
 pushd Tk/unix
 ./configure \
+    ZIPFS_BUILD=0 \
     CFLAGS=-mmacosx-version-min=10.13 \
     MACHER_PROG=/usr/bin/true \
     --enable-aqua \

Sage_framework/fix_paths.py

@@ -4,7 +4,6 @@
 import re
 LOCAL_LIB = '/private/var/tmp/sage-X.X-current/local/lib'
 get_info = re.compile(b'Filetype: (?P<filetype>.*)| *LC_LOAD_DYLIB: (?P<dylib>.*)| *LC_RPATH: (?P<rpath>.*)')
-get_version = re.compile(r'SageMath version ([0-9]*\.[0-9]*)')
 
 # Bigendian encoding of the magic numbers for mach-O binaries
 feedface_big = b'\xfe\xed\xfa\xce'
@@ -204,8 +203,6 @@ def fix_files(directory):
     except IndexError:
         print('Usage python3 fixpaths.py repo <directory>')
     with open(os.path.join(repo, 'sage', 'VERSION.txt')) as input_file:
-        m = get_version.match(input_file.readline())
-    sage_version = m.groups()[0]
+        sage_version = input_file.read().strip()
     LOCAL_LIB = LOCAL_LIB.replace('X.X', sage_version)
-    repo = os.path.abspath(repo)
     fix_files(directory)

jinja/templates/kernel.jinja2

@@ -1,5 +1,5 @@
 {
-    "argv": ["/var/tmp/sage-{{ sage_version }}-current/local/bin/python3",
+    "argv": ["/var/tmp/sage-{{ sage_version }}-current/venv/bin/sage", "--python",
 	     "-m",
 	     "sage.repl.ipython_kernel",
 	     "-f",