Overview
| Comment: | Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | dca99d948508284a19bb4c3eacfc9f2ecb10d91a |
| User & Date: | ssoberni on 2015-10-23 21:38:39 |
| Other Links: | manifest | tags |
Context
|
2015-10-28
| ||
| 15:18 | Added NSF package to web page check-in: 6fa06ab16c user: rkeene tags: trunk | |
|
2015-10-23
| ||
| 21:38 | Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE check-in: dca99d9485 user: ssoberni tags: trunk | |
| 20:43 | Give it another try. Mac builds are cross-compilations check-in: df5accddbb user: ssoberni tags: trunk | |
Changes
Modified nsf/build.sh from [007052aec1] to [08cdee6d2a].
95 95 if [ "${isshared}" = '0' ]; then 96 96 sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' configure > configure.new 97 97 else 98 98 sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new 99 99 fi 100 100 cat configure.new > configure 101 101 rm -f configure.new 102 - 102 + 103 + # Fix mkIndex.tcl for TCLSH_NATIVE being 8.4 (till next NSF release) 104 + cat library/lib/mkIndex.tcl > library/lib/mkIndex.tcl.orig 105 + cat << _EOF_ > library/lib/mkIndex.tcl 106 +if {[info commands ::tcl::tm::roots] eq ""} { 107 + namespace eval ::tcl::tm { proc roots args {;}} 108 +} 109 +source [file join [file dirname [info script]] mkIndex.tcl.orig] 110 +_EOF_ 103 111 ( 104 112 # Build 105 113 echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" 106 114 ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} 107 115 108 - echo "Running: ${MAKE:-make}" 109 - ${MAKE:-make} || exit 1 116 + echo "Running: ${MAKE:-make} TCLSH=${TCLSH_NATIVE}" 117 + ${MAKE:-make} TCLSH=${TCLSH_NATIVE} || exit 1 110 118 111 - echo "Running: ${MAKE:-make} install" 112 - ${MAKE:-make} install || ( 113 - ## cross-compiling? use TCLSH_NATIVE 114 - echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}" 115 - ${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1 116 - ) || exit 1 119 + echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}" 120 + ${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1 121 + 117 122 ) || continue 118 123 119 124 break 120 125 done 121 126 122 127 mkdir "${OUTDIR}/lib" || exit 1 123 128 cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"