KitCreator
Check-in [67d6bb3e7c]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Updated to continue if configure fails building Tk (bug [f75d036a14])
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 67d6bb3e7c5e9b4f99692f94202b65145866b342
User & Date: rkeene on 2016-09-07 14:15:01
Other Links: manifest | tags
Context
2016-09-28
12:52
Updated to support more advanced fossil versions without breaking things check-in: 7d2fd32e3a user: rkeene tags: trunk
2016-09-07
14:15
Updated to continue if configure fails building Tk (bug [f75d036a14]) check-in: 67d6bb3e7c user: rkeene tags: trunk
14:10
Updated patching of TclVFS to work with newer versions (addresses [468f6f72ea]) check-in: cbeb10f53c user: rkeene tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified tk/build.sh from [16d189fb24] to [d31f7c598a].

︙
204
205
206
207
208
209
210
211

212
213
214

215
216
217
218
219
220
221

204
205
206
207
208
209
210

211
212
213

214
215
216
217
218
219
220
221








-
+


-
+








				CFLAGS="${CFLAGS} -D_WIN32_IE=0x0501"
				export CPPFLAGS CFLAGS
			fi
		fi

		if [ "${STATICTK}" = "1" ]; then
			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} || continue
		else
			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} || continue
		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)"
︙

Powered by Fossil · RSS