diff options
Diffstat (limited to '004-use-system-zlib.mingw.patch')
| -rw-r--r-- | 004-use-system-zlib.mingw.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/004-use-system-zlib.mingw.patch b/004-use-system-zlib.mingw.patch index c7dc2103bf1a..e74b9b2a68f0 100644 --- a/004-use-system-zlib.mingw.patch +++ b/004-use-system-zlib.mingw.patch @@ -23,9 +23,9 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in --- tcl8.6.5-orig/win/Makefile.in 2016-03-01 04:59:35.000000000 +0300 +++ tcl8.6.5/win/Makefile.in 2016-03-03 08:47:47.129571100 +0300 @@ -146,9 +146,8 @@ - REG_LIB_FILE = @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX} - TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX} - TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${LIBSUFFIX} + 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@ @@ -42,15 +42,6 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in RMDIR = rm -rf MKDIR = mkdir -p -@@ -446,7 +445,7 @@ - @MAKE_STUB_LIB@ ${STUB_OBJS} - @POST_MAKE_LIB@ - --${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ -+${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) - @$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE) - @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) - @VC_MANIFEST_EMBED_DLL@ @@ -466,14 +465,6 @@ @$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE} @MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) |