diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-11-22 23:18:58 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-11-22 23:18:58 (GMT) |
| commit | a61946874ff92f0215f55382bd178f0246c9fd19 (patch) | |
| tree | 5075f28915c6e077fb1201ab20c36c6aab899742 /unix | |
| parent | c772e86ac5f5e700aec861b094a4b66fc012f80f (diff) | |
| parent | a694d92cbd24f1420fb67564e12fb1420a86ab9f (diff) | |
| download | tcl-a61946874ff92f0215f55382bd178f0246c9fd19.zip tcl-a61946874ff92f0215f55382bd178f0246c9fd19.tar.gz tcl-a61946874ff92f0215f55382bd178f0246c9fd19.tar.bz2 | |
merge 8.7 (build zipfs fixes)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index e883c5b..58c4063 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -683,7 +683,9 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH} cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl find ${TCL_VFS_ROOT} -type d -empty -delete - ( cd ${TCL_VFS_ROOT} ; ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH}) + echo "${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH}" + (zip=`readlink -m '${NATIVE_ZIP}'`; \ + cd ${TCL_VFS_ROOT} && $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && cd ..) # The following target is configured by autoconf to generate either a shared # library or non-shared library for Tcl. @@ -692,7 +694,8 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE} @MAKE_LIB@ @if test "${ZIPFS_BUILD}" = "1" ; then \ cat ${TCL_ZIP_FILE} >> ${LIB_FILE}; \ - ${NATIVE_ZIP} -A ${LIB_FILE}; \ + ${NATIVE_ZIP} -A ${LIB_FILE} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} diff --git a/unix/configure b/unix/configure index a6248af..0768833 100755 --- a/unix/configure +++ b/unix/configure @@ -10109,7 +10109,7 @@ $as_echo "Found INFO Zip in environment" >&6; } else # It is not an error if an installed version of Zip can't be located. # We can use the locally distributed minizip instead - ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}" + ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}" ZIP_PROG_OPTIONS="-o -r" ZIP_PROG_VFSSEARCH="." ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 5bcfd80..017ae25 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -3020,7 +3020,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [ else # It is not an error if an installed version of Zip can't be located. # We can use the locally distributed minizip instead - ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}" + ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}" ZIP_PROG_OPTIONS="-o -r" ZIP_PROG_VFSSEARCH="." ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}" |