Fossil SCM

Add comments to the MinGW makefiles. Also disable use of SSLv2 and SSLv3 when building with MSVC.

mistachkin 2014-12-19 21:15 trunk
Commit 1f91d041bf37f5992956ca1bfb15e9e5a7d598a0
Parent 623057ea5971c33…
4 files changed +19 -4 +16 -1 +16 -1 +3 -3
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+19 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514514
 # This is useful when Tcl has been compiled statically with MinGW.
515515
 #
516516
 FOSSIL_TCL_SOURCE = 1
517517
518518
 #### Check if the workaround for the MinGW command line handling needs to
519
-# be enabled by default.
519
+# be enabled by default. This check may be somewhat fragile due to the
520
+# use of "findstring".
520521
 #
521522
 ifndef MINGW_IS_32BIT_ONLY
522523
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523524
 MINGW_IS_32BIT_ONLY = 1
524525
 endif
@@ -527,16 +528,23 @@
527528
 #### The directories where the zlib include and library files are located.
528529
 #
529530
 ZINCDIR = $(SRCDIR)/../compat/zlib
530531
 ZLIBDIR = $(SRCDIR)/../compat/zlib
531532
533
+#### Make an attempt to detect if Fossil is being built for the x64 processor
534
+# architecture. This check may be somewhat fragile due to "findstring".
535
+#
532536
 ifndef X64
533537
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
534538
 X64 = 1
535539
 endif
536540
 endif
537541
542
+#### Determine if the optimized assembly routines provided with zlib should be
543
+# used, taking into account whether zlib is actually enabled and the target
544
+# processor architecture.
545
+#
538546
 ifndef X64
539547
 SSLCONFIG = mingw
540548
 ifndef FOSSIL_ENABLE_MINIZ
541549
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
542550
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,11 +556,18 @@
548556
 SSLCONFIG = mingw64
549557
 ZLIBCONFIG =
550558
 LIBTARGETS =
551559
 endif
552560
561
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
562
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
563
+#
553564
 SSLCONFIG += no-ssl2 no-ssl3 no-shared
565
+
566
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
567
+# that Fossil knows about (i.e. the one within the source tree).
568
+#
554569
 ifndef FOSSIL_ENABLE_MINIZ
555570
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
556571
 endif
557572
558573
 #### The directories where the OpenSSL include and library files are located.
@@ -1297,21 +1312,21 @@
12971312
 SSLLIBDIR = $(SSLDIR)\out32
12981313
 SSLLFLAGS = /nologo /opt:ref /debug
12991314
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
13001315
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
13011316
 !message Using 'x64' platform for OpenSSL...
1302
-SSLCONFIG = VC-WIN64A no-asm
1317
+SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
13031318
 SSLSETUP = ms\do_win64a.bat
13041319
 SSLNMAKE = ms\nt.mak all
13051320
 !elseif "$(PLATFORM)"=="ia64"
13061321
 !message Using 'ia64' platform for OpenSSL...
1307
-SSLCONFIG = VC-WIN64I no-asm
1322
+SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
13081323
 SSLSETUP = ms\do_win64i.bat
13091324
 SSLNMAKE = ms\nt.mak all
13101325
 !else
13111326
 !message Assuming 'x86' platform for OpenSSL...
1312
-SSLCONFIG = VC-WIN32 no-asm
1327
+SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
13131328
 SSLSETUP = ms\do_ms.bat
13141329
 SSLNMAKE = ms\nt.mak all
13151330
 !endif
13161331
 !endif
13171332
13181333
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514 # This is useful when Tcl has been compiled statically with MinGW.
515 #
516 FOSSIL_TCL_SOURCE = 1
517
518 #### Check if the workaround for the MinGW command line handling needs to
519 # be enabled by default.
 
520 #
521 ifndef MINGW_IS_32BIT_ONLY
522 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523 MINGW_IS_32BIT_ONLY = 1
524 endif
@@ -527,16 +528,23 @@
527 #### The directories where the zlib include and library files are located.
528 #
529 ZINCDIR = $(SRCDIR)/../compat/zlib
530 ZLIBDIR = $(SRCDIR)/../compat/zlib
531
 
 
 
532 ifndef X64
533 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
534 X64 = 1
535 endif
536 endif
537
 
 
 
 
538 ifndef X64
539 SSLCONFIG = mingw
540 ifndef FOSSIL_ENABLE_MINIZ
541 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
542 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,11 +556,18 @@
548 SSLCONFIG = mingw64
549 ZLIBCONFIG =
550 LIBTARGETS =
551 endif
552
 
 
 
553 SSLCONFIG += no-ssl2 no-ssl3 no-shared
 
 
 
 
554 ifndef FOSSIL_ENABLE_MINIZ
555 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
556 endif
557
558 #### The directories where the OpenSSL include and library files are located.
@@ -1297,21 +1312,21 @@
1297 SSLLIBDIR = $(SSLDIR)\out32
1298 SSLLFLAGS = /nologo /opt:ref /debug
1299 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1300 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1301 !message Using 'x64' platform for OpenSSL...
1302 SSLCONFIG = VC-WIN64A no-asm
1303 SSLSETUP = ms\do_win64a.bat
1304 SSLNMAKE = ms\nt.mak all
1305 !elseif "$(PLATFORM)"=="ia64"
1306 !message Using 'ia64' platform for OpenSSL...
1307 SSLCONFIG = VC-WIN64I no-asm
1308 SSLSETUP = ms\do_win64i.bat
1309 SSLNMAKE = ms\nt.mak all
1310 !else
1311 !message Assuming 'x86' platform for OpenSSL...
1312 SSLCONFIG = VC-WIN32 no-asm
1313 SSLSETUP = ms\do_ms.bat
1314 SSLNMAKE = ms\nt.mak all
1315 !endif
1316 !endif
1317
1318
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514 # This is useful when Tcl has been compiled statically with MinGW.
515 #
516 FOSSIL_TCL_SOURCE = 1
517
518 #### Check if the workaround for the MinGW command line handling needs to
519 # be enabled by default. This check may be somewhat fragile due to the
520 # use of "findstring".
521 #
522 ifndef MINGW_IS_32BIT_ONLY
523 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
524 MINGW_IS_32BIT_ONLY = 1
525 endif
@@ -527,16 +528,23 @@
528 #### The directories where the zlib include and library files are located.
529 #
530 ZINCDIR = $(SRCDIR)/../compat/zlib
531 ZLIBDIR = $(SRCDIR)/../compat/zlib
532
533 #### Make an attempt to detect if Fossil is being built for the x64 processor
534 # architecture. This check may be somewhat fragile due to "findstring".
535 #
536 ifndef X64
537 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
538 X64 = 1
539 endif
540 endif
541
542 #### Determine if the optimized assembly routines provided with zlib should be
543 # used, taking into account whether zlib is actually enabled and the target
544 # processor architecture.
545 #
546 ifndef X64
547 SSLCONFIG = mingw
548 ifndef FOSSIL_ENABLE_MINIZ
549 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
550 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,11 +556,18 @@
556 SSLCONFIG = mingw64
557 ZLIBCONFIG =
558 LIBTARGETS =
559 endif
560
561 #### Disable creation of the OpenSSL shared libraries. Also, disable support
562 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
563 #
564 SSLCONFIG += no-ssl2 no-ssl3 no-shared
565
566 #### When using zlib, make sure that OpenSSL is configured to use the zlib
567 # that Fossil knows about (i.e. the one within the source tree).
568 #
569 ifndef FOSSIL_ENABLE_MINIZ
570 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
571 endif
572
573 #### The directories where the OpenSSL include and library files are located.
@@ -1297,21 +1312,21 @@
1312 SSLLIBDIR = $(SSLDIR)\out32
1313 SSLLFLAGS = /nologo /opt:ref /debug
1314 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1315 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1316 !message Using 'x64' platform for OpenSSL...
1317 SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
1318 SSLSETUP = ms\do_win64a.bat
1319 SSLNMAKE = ms\nt.mak all
1320 !elseif "$(PLATFORM)"=="ia64"
1321 !message Using 'ia64' platform for OpenSSL...
1322 SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
1323 SSLSETUP = ms\do_win64i.bat
1324 SSLNMAKE = ms\nt.mak all
1325 !else
1326 !message Assuming 'x86' platform for OpenSSL...
1327 SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
1328 SSLSETUP = ms\do_ms.bat
1329 SSLNMAKE = ms\nt.mak all
1330 !endif
1331 !endif
1332
1333
M win/Makefile.mingw
+16 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
8787
 # This is useful when Tcl has been compiled statically with MinGW.
8888
 #
8989
 FOSSIL_TCL_SOURCE = 1
9090
9191
 #### Check if the workaround for the MinGW command line handling needs to
92
-# be enabled by default.
92
+# be enabled by default. This check may be somewhat fragile due to the
93
+# use of "findstring".
9394
 #
9495
 ifndef MINGW_IS_32BIT_ONLY
9596
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9697
 MINGW_IS_32BIT_ONLY = 1
9798
 endif
@@ -100,16 +101,23 @@
100101
 #### The directories where the zlib include and library files are located.
101102
 #
102103
 ZINCDIR = $(SRCDIR)/../compat/zlib
103104
 ZLIBDIR = $(SRCDIR)/../compat/zlib
104105
106
+#### Make an attempt to detect if Fossil is being built for the x64 processor
107
+# architecture. This check may be somewhat fragile due to "findstring".
108
+#
105109
 ifndef X64
106110
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107111
 X64 = 1
108112
 endif
109113
 endif
110114
115
+#### Determine if the optimized assembly routines provided with zlib should be
116
+# used, taking into account whether zlib is actually enabled and the target
117
+# processor architecture.
118
+#
111119
 ifndef X64
112120
 SSLCONFIG = mingw
113121
 ifndef FOSSIL_ENABLE_MINIZ
114122
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115123
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
121129
 SSLCONFIG = mingw64
122130
 ZLIBCONFIG =
123131
 LIBTARGETS =
124132
 endif
125133
134
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
135
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136
+#
126137
 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
+
139
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
140
+# that Fossil knows about (i.e. the one within the source tree).
141
+#
127142
 ifndef FOSSIL_ENABLE_MINIZ
128143
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
129144
 endif
130145
131146
 #### The directories where the OpenSSL include and library files are located.
132147
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default.
 
93 #
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
@@ -100,16 +101,23 @@
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
104
 
 
 
105 ifndef X64
106 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107 X64 = 1
108 endif
109 endif
110
 
 
 
 
111 ifndef X64
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
 
 
 
126 SSLCONFIG += no-ssl2 no-ssl3 no-shared
 
 
 
 
127 ifndef FOSSIL_ENABLE_MINIZ
128 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
129 endif
130
131 #### The directories where the OpenSSL include and library files are located.
132
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default. This check may be somewhat fragile due to the
93 # use of "findstring".
94 #
95 ifndef MINGW_IS_32BIT_ONLY
96 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
97 MINGW_IS_32BIT_ONLY = 1
98 endif
@@ -100,16 +101,23 @@
101 #### The directories where the zlib include and library files are located.
102 #
103 ZINCDIR = $(SRCDIR)/../compat/zlib
104 ZLIBDIR = $(SRCDIR)/../compat/zlib
105
106 #### Make an attempt to detect if Fossil is being built for the x64 processor
107 # architecture. This check may be somewhat fragile due to "findstring".
108 #
109 ifndef X64
110 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
111 X64 = 1
112 endif
113 endif
114
115 #### Determine if the optimized assembly routines provided with zlib should be
116 # used, taking into account whether zlib is actually enabled and the target
117 # processor architecture.
118 #
119 ifndef X64
120 SSLCONFIG = mingw
121 ifndef FOSSIL_ENABLE_MINIZ
122 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
123 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
129 SSLCONFIG = mingw64
130 ZLIBCONFIG =
131 LIBTARGETS =
132 endif
133
134 #### Disable creation of the OpenSSL shared libraries. Also, disable support
135 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136 #
137 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
139 #### When using zlib, make sure that OpenSSL is configured to use the zlib
140 # that Fossil knows about (i.e. the one within the source tree).
141 #
142 ifndef FOSSIL_ENABLE_MINIZ
143 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
144 endif
145
146 #### The directories where the OpenSSL include and library files are located.
147
M win/Makefile.mingw.mistachkin
+16 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
8787
 # This is useful when Tcl has been compiled statically with MinGW.
8888
 #
8989
 FOSSIL_TCL_SOURCE = 1
9090
9191
 #### Check if the workaround for the MinGW command line handling needs to
92
-# be enabled by default.
92
+# be enabled by default. This check may be somewhat fragile due to the
93
+# use of "findstring".
9394
 #
9495
 ifndef MINGW_IS_32BIT_ONLY
9596
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9697
 MINGW_IS_32BIT_ONLY = 1
9798
 endif
@@ -100,16 +101,23 @@
100101
 #### The directories where the zlib include and library files are located.
101102
 #
102103
 ZINCDIR = $(SRCDIR)/../compat/zlib
103104
 ZLIBDIR = $(SRCDIR)/../compat/zlib
104105
106
+#### Make an attempt to detect if Fossil is being built for the x64 processor
107
+# architecture. This check may be somewhat fragile due to "findstring".
108
+#
105109
 ifndef X64
106110
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107111
 X64 = 1
108112
 endif
109113
 endif
110114
115
+#### Determine if the optimized assembly routines provided with zlib should be
116
+# used, taking into account whether zlib is actually enabled and the target
117
+# processor architecture.
118
+#
111119
 ifndef X64
112120
 SSLCONFIG = mingw
113121
 ifndef FOSSIL_ENABLE_MINIZ
114122
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115123
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
121129
 SSLCONFIG = mingw64
122130
 ZLIBCONFIG =
123131
 LIBTARGETS =
124132
 endif
125133
134
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
135
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136
+#
126137
 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
+
139
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
140
+# that Fossil knows about (i.e. the one within the source tree).
141
+#
127142
 ifndef FOSSIL_ENABLE_MINIZ
128143
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
129144
 endif
130145
131146
 #### The directories where the OpenSSL include and library files are located.
132147
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default.
 
93 #
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
@@ -100,16 +101,23 @@
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
104
 
 
 
105 ifndef X64
106 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107 X64 = 1
108 endif
109 endif
110
 
 
 
 
111 ifndef X64
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
 
 
 
126 SSLCONFIG += no-ssl2 no-ssl3 no-shared
 
 
 
 
127 ifndef FOSSIL_ENABLE_MINIZ
128 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
129 endif
130
131 #### The directories where the OpenSSL include and library files are located.
132
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default. This check may be somewhat fragile due to the
93 # use of "findstring".
94 #
95 ifndef MINGW_IS_32BIT_ONLY
96 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
97 MINGW_IS_32BIT_ONLY = 1
98 endif
@@ -100,16 +101,23 @@
101 #### The directories where the zlib include and library files are located.
102 #
103 ZINCDIR = $(SRCDIR)/../compat/zlib
104 ZLIBDIR = $(SRCDIR)/../compat/zlib
105
106 #### Make an attempt to detect if Fossil is being built for the x64 processor
107 # architecture. This check may be somewhat fragile due to "findstring".
108 #
109 ifndef X64
110 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
111 X64 = 1
112 endif
113 endif
114
115 #### Determine if the optimized assembly routines provided with zlib should be
116 # used, taking into account whether zlib is actually enabled and the target
117 # processor architecture.
118 #
119 ifndef X64
120 SSLCONFIG = mingw
121 ifndef FOSSIL_ENABLE_MINIZ
122 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
123 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,11 +129,18 @@
129 SSLCONFIG = mingw64
130 ZLIBCONFIG =
131 LIBTARGETS =
132 endif
133
134 #### Disable creation of the OpenSSL shared libraries. Also, disable support
135 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136 #
137 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
139 #### When using zlib, make sure that OpenSSL is configured to use the zlib
140 # that Fossil knows about (i.e. the one within the source tree).
141 #
142 ifndef FOSSIL_ENABLE_MINIZ
143 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
144 endif
145
146 #### The directories where the OpenSSL include and library files are located.
147
M win/Makefile.msc
+3 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,21 +62,21 @@
6262
 SSLLIBDIR = $(SSLDIR)\out32
6363
 SSLLFLAGS = /nologo /opt:ref /debug
6464
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
6565
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
6666
 !message Using 'x64' platform for OpenSSL...
67
-SSLCONFIG = VC-WIN64A no-asm
67
+SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
6868
 SSLSETUP = ms\do_win64a.bat
6969
 SSLNMAKE = ms\nt.mak all
7070
 !elseif "$(PLATFORM)"=="ia64"
7171
 !message Using 'ia64' platform for OpenSSL...
72
-SSLCONFIG = VC-WIN64I no-asm
72
+SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
7373
 SSLSETUP = ms\do_win64i.bat
7474
 SSLNMAKE = ms\nt.mak all
7575
 !else
7676
 !message Assuming 'x86' platform for OpenSSL...
77
-SSLCONFIG = VC-WIN32 no-asm
77
+SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
7878
 SSLSETUP = ms\do_ms.bat
7979
 SSLNMAKE = ms\nt.mak all
8080
 !endif
8181
 !endif
8282
8383
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,21 +62,21 @@
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66 !message Using 'x64' platform for OpenSSL...
67 SSLCONFIG = VC-WIN64A no-asm
68 SSLSETUP = ms\do_win64a.bat
69 SSLNMAKE = ms\nt.mak all
70 !elseif "$(PLATFORM)"=="ia64"
71 !message Using 'ia64' platform for OpenSSL...
72 SSLCONFIG = VC-WIN64I no-asm
73 SSLSETUP = ms\do_win64i.bat
74 SSLNMAKE = ms\nt.mak all
75 !else
76 !message Assuming 'x86' platform for OpenSSL...
77 SSLCONFIG = VC-WIN32 no-asm
78 SSLSETUP = ms\do_ms.bat
79 SSLNMAKE = ms\nt.mak all
80 !endif
81 !endif
82
83
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,21 +62,21 @@
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66 !message Using 'x64' platform for OpenSSL...
67 SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
68 SSLSETUP = ms\do_win64a.bat
69 SSLNMAKE = ms\nt.mak all
70 !elseif "$(PLATFORM)"=="ia64"
71 !message Using 'ia64' platform for OpenSSL...
72 SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
73 SSLSETUP = ms\do_win64i.bat
74 SSLNMAKE = ms\nt.mak all
75 !else
76 !message Assuming 'x86' platform for OpenSSL...
77 SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
78 SSLSETUP = ms\do_ms.bat
79 SSLNMAKE = ms\nt.mak all
80 !endif
81 !endif
82
83

Keyboard Shortcuts

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