diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-05-28 05:18:46 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-05-28 05:18:46 (GMT) |
| commit | 8a11ae670f9e447985a7650d9e56cc32ea00cb5b (patch) | |
| tree | ca1a0942e0d8e68964a12de3cb5cf6595cc7433c /plugins | |
| parent | cbea32e9829c6e7870bc3e064f8287adcf2f6b52 (diff) | |
| download | mxe-8a11ae670f9e447985a7650d9e56cc32ea00cb5b.zip mxe-8a11ae670f9e447985a7650d9e56cc32ea00cb5b.tar.gz mxe-8a11ae670f9e447985a7650d9e56cc32ea00cb5b.tar.bz2 | |
tcl/tk: use external zlib
closes #2130
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/tcl.tk/tcl.mk | 2 | ||||
| -rw-r--r-- | plugins/tcl.tk/tk-1-fixes.patch | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/plugins/tcl.tk/tcl.mk b/plugins/tcl.tk/tcl.mk index b46ee0a..89b2434 100644 --- a/plugins/tcl.tk/tcl.mk +++ b/plugins/tcl.tk/tcl.mk @@ -2,4 +2,4 @@ PKG := tcl $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) -$(PKG)_DEPS := cc zlib +$(PKG)_DEPS := cc zlib $(BUILD)~$(PKG) diff --git a/plugins/tcl.tk/tk-1-fixes.patch b/plugins/tcl.tk/tk-1-fixes.patch new file mode 100644 index 0000000..6f6e8de --- /dev/null +++ b/plugins/tcl.tk/tk-1-fixes.patch @@ -0,0 +1,22 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Mon, 28 May 2018 15:14:50 +1000 +Subject: [PATCH 1/1] search for zlib + + +diff --git a/win/configure.in b/win/configure.in +index 1111111..2222222 100644 +--- a/win/configure.in ++++ b/win/configure.in +@@ -222,6 +222,7 @@ case "$TK_PATCH_LEVEL" in + *) TK_RELEASE_LEVEL=2 ;; + esac + TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`" ++AC_SEARCH_LIBS(zlibVersion, z) + AC_SUBST(TK_WIN_VERSION) + # X86|AMD64|IA64 for manifest + AC_SUBST(MACHINE) |