You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
2.8 KiB
87 lines
2.8 KiB
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 13:00:57 +1000
|
|
Subject: [PATCH 1/1] tcl: remove bundled zlib
|
|
|
|
see: https://github.com/mxe/mxe/issues/2130
|
|
|
|
diff --git a/win/Makefile.in b/win/Makefile.in
|
|
index 1111111..2222222 100644
|
|
--- a/win/Makefile.in
|
|
+++ b/win/Makefile.in
|
|
@@ -153,9 +153,8 @@ TEST_LOAD_PRMS = package ifneeded dde 1.4.2 [list load [file normalize ${DDE_DL
|
|
package ifneeded registry 1.3.4 [list load [file normalize ${REG_DLL_FILE}] registry]
|
|
TEST_LOAD_FACILITIES = package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
|
|
$(TEST_LOAD_PRMS)
|
|
-ZLIB_DLL_FILE = zlib1.dll
|
|
|
|
-SHARED_LIBRARIES = $(TCL_DLL_FILE) @ZLIB_DLL_FILE@
|
|
+SHARED_LIBRARIES = $(TCL_DLL_FILE)
|
|
STATIC_LIBRARIES = $(TCL_LIB_FILE)
|
|
|
|
TCLSH = tclsh$(VER)${EXESUFFIX}
|
|
@@ -416,7 +415,7 @@ ZLIB_OBJS = \
|
|
uncompr.$(OBJEXT) \
|
|
zutil.$(OBJEXT)
|
|
|
|
-TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS} @ZLIB_OBJS@
|
|
+TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS}
|
|
|
|
TCL_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
|
|
|
|
@@ -511,14 +510,6 @@ ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
|
|
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
|
|
$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
|
|
|
|
-# use pre-built zlib1.dll
|
|
-${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
|
|
- @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \
|
|
- $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
|
|
- else \
|
|
- $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
|
|
- fi;
|
|
-
|
|
# Add the object extension to the implicit rules. By default .obj is not
|
|
# automatically added.
|
|
|
|
@@ -633,7 +624,7 @@ install-binaries: binaries
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @for i in $(TCL_DLL_FILE) $(ZLIB_DLL_FILE) $(TCLSH); \
|
|
+ @for i in $(TCL_DLL_FILE) $(TCLSH); \
|
|
do \
|
|
if [ -f $$i ]; then \
|
|
echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \
|
|
diff --git a/win/configure.in b/win/configure.in
|
|
index 1111111..2222222 100644
|
|
--- a/win/configure.in
|
|
+++ b/win/configure.in
|
|
@@ -140,20 +140,8 @@ AS_IF([test "${enable_shared+set}" = "set"], [
|
|
], [
|
|
tcl_ok=yes
|
|
])
|
|
-AS_IF([test "$tcl_ok" = "yes"], [
|
|
- AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
|
|
- AS_IF([test "$do64bit" != "no"], [
|
|
- AS_IF([test "$GCC" == "yes"],[
|
|
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
|
|
- ], [
|
|
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
|
|
- ])
|
|
- ], [
|
|
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
|
|
- ])
|
|
-], [
|
|
- AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
|
|
-])
|
|
+
|
|
+AC_SUBST(ZLIB_LIBS,[-lz])
|
|
AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?])
|
|
|
|
AC_CHECK_TYPE([intptr_t], [
|