Overview
| Comment: | Added workaround for building bug in Tk on FreeBSD | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | 
| Files: | files | file ages | folders | 
| SHA1: | 612f995831b65b22ef9f2545619a7f5f | 
| User & Date: | rkeene on 2010-11-11 17:16:29 | 
| Other Links: | manifest | tags | 
Context
| 2011-02-08 | ||
| 07:47 | Updated to pull "CVS" updates from Fossil (location and method may change in the future) check-in: a0fa3aeee4 user: rkeene tags: trunk | |
| 06:57 | Create new branch named "merge-kitdll-kitsh-common" check-in: 705256170a user: rkeene tags: merge-kitdll-kitsh-common | |
| 06:53 | Create new branch named "pluggable" check-in: 960b777fca user: rkeene tags: pluggable | |
| 2010-11-11 | ||
| 17:16 | Added workaround for building bug in Tk on FreeBSD check-in: 612f995831 user: rkeene tags: trunk | |
| 2010-11-03 | ||
| 14:02 | Updated nightly builds to start from clean source every Wednesday check-in: f1179eeee0 user: rkeene tags: trunk | |
Changes
Modified tk/build.sh from [f6d4d528ed] to [394ddd8947].
| ︙ | ︙ | |||
| 122 123 124 125 126 127 128 | 
			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		else
			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		fi
		echo "Running: ${MAKE:-make}"
 | | > > > > > > > > > > | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | 
			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		else
			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
		fi
		echo "Running: ${MAKE:-make}"
		${MAKE:-make} || (
			# Workaround a bug in Tk on FreeBSD 8.1:
			#   https://sourceforge.net/tracker/?func=detail&atid=112997&aid=3107390&group_id=12997
			LIBTKFILE="$(ls libtk*.so.1 2>/dev/null | head -1)"
			if [ -f "${LIBTKFILE}" ]; then
				NEWLIBTKFILE="$(echo "${LIBTKFILE}" | sed 's@\.so\.1@.so@')"
				cp "${LIBTKFILE}" "${NEWLIBTKFILE}"
			fi
			${MAKE:-make}
		) || continue
		echo "Running: ${MAKE:-make} install"
		${MAKE:-make} install || continue
		# Update to include resources, if found
		if [ "${dir}" = "win" ]; then
			echo ' *** Creating tkbase.res.o to support Windows build'
 | 
| ︙ | ︙ |