Fossil SCM

Unbreak MinGW build to account for deletions in zlib 1.2.13.

mistachkin 2022-12-20 05:00 trunk
Commit a24a790f3d6c0f7b7de0dfb292eacc7e8ad4ffc3a1027ea872634ac5e16e7daa
Parent 2213a0eb2d413fc…
3 files changed +2 -8 +2 -8 +4 -8
~ tools/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M tools/makemake.tcl
+2 -8
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -736,12 +736,12 @@
736736
 # used, taking into account whether zlib is actually enabled and the target
737737
 # processor architecture.
738738
 #
739739
 ifndef X64
740740
 SSLCONFIG = mingw
741
-ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
742
-ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
741
+ZLIBCONFIG =
742
+ZLIBTARGETS =
743743
 else
744744
 SSLCONFIG = mingw64
745745
 ZLIBCONFIG =
746746
 ZLIBTARGETS =
747747
 endif
@@ -1164,16 +1164,10 @@
11641164
 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
11651165
 $(OBJDIR)/cson_amalgamation.o
11661166
 }]
11671167
11681168
 writeln {
1169
-$(ZLIBDIR)/inffas86.o:
1170
- $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1171
-
1172
-$(ZLIBDIR)/match.o:
1173
- $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1174
-
11751169
 zlib: $(ZLIBTARGETS)
11761170
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11771171
11781172
 clean-zlib:
11791173
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
11801174
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -736,12 +736,12 @@
736 # used, taking into account whether zlib is actually enabled and the target
737 # processor architecture.
738 #
739 ifndef X64
740 SSLCONFIG = mingw
741 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
742 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
743 else
744 SSLCONFIG = mingw64
745 ZLIBCONFIG =
746 ZLIBTARGETS =
747 endif
@@ -1164,16 +1164,10 @@
1164 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
1165 $(OBJDIR)/cson_amalgamation.o
1166 }]
1167
1168 writeln {
1169 $(ZLIBDIR)/inffas86.o:
1170 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1171
1172 $(ZLIBDIR)/match.o:
1173 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1174
1175 zlib: $(ZLIBTARGETS)
1176 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1177
1178 clean-zlib:
1179 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1180
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -736,12 +736,12 @@
736 # used, taking into account whether zlib is actually enabled and the target
737 # processor architecture.
738 #
739 ifndef X64
740 SSLCONFIG = mingw
741 ZLIBCONFIG =
742 ZLIBTARGETS =
743 else
744 SSLCONFIG = mingw64
745 ZLIBCONFIG =
746 ZLIBTARGETS =
747 endif
@@ -1164,16 +1164,10 @@
1164 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
1165 $(OBJDIR)/cson_amalgamation.o
1166 }]
1167
1168 writeln {
 
 
 
 
 
 
1169 zlib: $(ZLIBTARGETS)
1170 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1171
1172 clean-zlib:
1173 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1174
M win/Makefile.mingw
+2 -8
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -138,12 +138,12 @@
138138
 # used, taking into account whether zlib is actually enabled and the target
139139
 # processor architecture.
140140
 #
141141
 ifndef X64
142142
 SSLCONFIG = mingw
143
-ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144
-ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
143
+ZLIBCONFIG =
144
+ZLIBTARGETS =
145145
 else
146146
 SSLCONFIG = mingw64
147147
 ZLIBCONFIG =
148148
 ZLIBTARGETS =
149149
 endif
@@ -1104,16 +1104,10 @@
11041104
 $(OBJDIR)/th_lang.o \
11051105
 $(OBJDIR)/th_tcl.o \
11061106
 $(OBJDIR)/cson_amalgamation.o
11071107
11081108
1109
-$(ZLIBDIR)/inffas86.o:
1110
- $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1111
-
1112
-$(ZLIBDIR)/match.o:
1113
- $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1114
-
11151109
 zlib: $(ZLIBTARGETS)
11161110
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11171111
11181112
 clean-zlib:
11191113
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
11201114
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -138,12 +138,12 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
143 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
145 else
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
@@ -1104,16 +1104,10 @@
1104 $(OBJDIR)/th_lang.o \
1105 $(OBJDIR)/th_tcl.o \
1106 $(OBJDIR)/cson_amalgamation.o
1107
1108
1109 $(ZLIBDIR)/inffas86.o:
1110 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1111
1112 $(ZLIBDIR)/match.o:
1113 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1114
1115 zlib: $(ZLIBTARGETS)
1116 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1117
1118 clean-zlib:
1119 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1120
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -138,12 +138,12 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
143 ZLIBCONFIG =
144 ZLIBTARGETS =
145 else
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
@@ -1104,16 +1104,10 @@
1104 $(OBJDIR)/th_lang.o \
1105 $(OBJDIR)/th_tcl.o \
1106 $(OBJDIR)/cson_amalgamation.o
1107
1108
 
 
 
 
 
 
1109 zlib: $(ZLIBTARGETS)
1110 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1111
1112 clean-zlib:
1113 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1114
M win/Makefile.mingw.mistachkin
+4 -8
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -138,12 +138,12 @@
138138
 # used, taking into account whether zlib is actually enabled and the target
139139
 # processor architecture.
140140
 #
141141
 ifndef X64
142142
 SSLCONFIG = mingw
143
-ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144
-ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
143
+ZLIBCONFIG =
144
+ZLIBTARGETS =
145145
 else
146146
 SSLCONFIG = mingw64
147147
 ZLIBCONFIG =
148148
 ZLIBTARGETS =
149149
 endif
@@ -1104,16 +1104,10 @@
11041104
 $(OBJDIR)/th_lang.o \
11051105
 $(OBJDIR)/th_tcl.o \
11061106
 $(OBJDIR)/cson_amalgamation.o
11071107
11081108
1109
-$(ZLIBDIR)/inffas86.o:
1110
- $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1111
-
1112
-$(ZLIBDIR)/match.o:
1113
- $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1114
-
11151109
 zlib: $(ZLIBTARGETS)
11161110
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11171111
11181112
 clean-zlib:
11191113
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
@@ -2528,10 +2522,11 @@
25282522
 -DSQLITE_ENABLE_FTS5 \
25292523
 -DSQLITE_ENABLE_STMTVTAB \
25302524
 -DSQLITE_HAVE_ZLIB \
25312525
 -DSQLITE_ENABLE_DBPAGE_VTAB \
25322526
 -DSQLITE_TRUSTED_SCHEMA=0 \
2527
+ -DHAVE_USLEEP \
25332528
 -DSQLITE_WIN32_NO_ANSI \
25342529
 $(MINGW_OPTIONS) \
25352530
 -DSQLITE_USE_MALLOC_H \
25362531
 -DSQLITE_USE_MSIZE
25372532
@@ -2555,10 +2550,11 @@
25552550
 -DSQLITE_ENABLE_FTS5 \
25562551
 -DSQLITE_ENABLE_STMTVTAB \
25572552
 -DSQLITE_HAVE_ZLIB \
25582553
 -DSQLITE_ENABLE_DBPAGE_VTAB \
25592554
 -DSQLITE_TRUSTED_SCHEMA=0 \
2555
+ -DHAVE_USLEEP \
25602556
 -Dmain=sqlite3_shell \
25612557
 -DSQLITE_SHELL_IS_UTF8=1 \
25622558
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
25632559
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
25642560
 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
25652561
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -138,12 +138,12 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
143 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
145 else
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
@@ -1104,16 +1104,10 @@
1104 $(OBJDIR)/th_lang.o \
1105 $(OBJDIR)/th_tcl.o \
1106 $(OBJDIR)/cson_amalgamation.o
1107
1108
1109 $(ZLIBDIR)/inffas86.o:
1110 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1111
1112 $(ZLIBDIR)/match.o:
1113 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1114
1115 zlib: $(ZLIBTARGETS)
1116 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1117
1118 clean-zlib:
1119 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
@@ -2528,10 +2522,11 @@
2528 -DSQLITE_ENABLE_FTS5 \
2529 -DSQLITE_ENABLE_STMTVTAB \
2530 -DSQLITE_HAVE_ZLIB \
2531 -DSQLITE_ENABLE_DBPAGE_VTAB \
2532 -DSQLITE_TRUSTED_SCHEMA=0 \
 
2533 -DSQLITE_WIN32_NO_ANSI \
2534 $(MINGW_OPTIONS) \
2535 -DSQLITE_USE_MALLOC_H \
2536 -DSQLITE_USE_MSIZE
2537
@@ -2555,10 +2550,11 @@
2555 -DSQLITE_ENABLE_FTS5 \
2556 -DSQLITE_ENABLE_STMTVTAB \
2557 -DSQLITE_HAVE_ZLIB \
2558 -DSQLITE_ENABLE_DBPAGE_VTAB \
2559 -DSQLITE_TRUSTED_SCHEMA=0 \
 
2560 -Dmain=sqlite3_shell \
2561 -DSQLITE_SHELL_IS_UTF8=1 \
2562 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2563 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2564 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2565
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -138,12 +138,12 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
143 ZLIBCONFIG =
144 ZLIBTARGETS =
145 else
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
@@ -1104,16 +1104,10 @@
1104 $(OBJDIR)/th_lang.o \
1105 $(OBJDIR)/th_tcl.o \
1106 $(OBJDIR)/cson_amalgamation.o
1107
1108
 
 
 
 
 
 
1109 zlib: $(ZLIBTARGETS)
1110 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1111
1112 clean-zlib:
1113 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
@@ -2528,10 +2522,11 @@
2522 -DSQLITE_ENABLE_FTS5 \
2523 -DSQLITE_ENABLE_STMTVTAB \
2524 -DSQLITE_HAVE_ZLIB \
2525 -DSQLITE_ENABLE_DBPAGE_VTAB \
2526 -DSQLITE_TRUSTED_SCHEMA=0 \
2527 -DHAVE_USLEEP \
2528 -DSQLITE_WIN32_NO_ANSI \
2529 $(MINGW_OPTIONS) \
2530 -DSQLITE_USE_MALLOC_H \
2531 -DSQLITE_USE_MSIZE
2532
@@ -2555,10 +2550,11 @@
2550 -DSQLITE_ENABLE_FTS5 \
2551 -DSQLITE_ENABLE_STMTVTAB \
2552 -DSQLITE_HAVE_ZLIB \
2553 -DSQLITE_ENABLE_DBPAGE_VTAB \
2554 -DSQLITE_TRUSTED_SCHEMA=0 \
2555 -DHAVE_USLEEP \
2556 -Dmain=sqlite3_shell \
2557 -DSQLITE_SHELL_IS_UTF8=1 \
2558 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2559 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2560 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2561

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button