Fossil SCM

Complete transition to OpenSSL 1.1.0, which needs additional library on Windows (crypt32.dll) and which has support for ssl2 removed completely.

jan.nijtmans 2016-09-07 11:12 openssl-1.1
Commit 7839ff02860a93ff8e1ae209b06aedff3bdc852c
Parent 958f1a89dc720e9…
5 files changed +2 -2 +10 -10 +3 -3 +6 -6 +7 -7
~ auto.def ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M auto.def
+2 -2
--- auto.def
+++ auto.def
@@ -194,11 +194,11 @@
194194
 # Helper for OpenSSL checking
195195
 proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
196196
 msg-checking "Checking for $msg..."
197197
 set rc 0
198198
 if {[is_mingw]} {
199
- lappend libs -lgdi32 -lwsock32
199
+ lappend libs -lgdi32 -lwsock32 -lcrypt32
200200
 }
201201
 if {[info exists ::zlib_lib]} {
202202
 lappend libs $::zlib_lib
203203
 }
204204
 msg-quiet cc-with [list -cflags $cflags -libs $libs] {
@@ -313,11 +313,11 @@
313313
 }
314314
 if {[info exists ::zlib_lib]} {
315315
 define-append LIBS $::zlib_lib
316316
 }
317317
 if {[is_mingw]} {
318
- define-append LIBS -lgdi32 -lwsock32
318
+ define-append LIBS -lgdi32 -lwsock32 -lcrypt32
319319
 }
320320
 msg-result "HTTPS support enabled"
321321
322322
 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
323323
 if {[string match *-darwin* [get-define host]]} {
324324
--- auto.def
+++ auto.def
@@ -194,11 +194,11 @@
194 # Helper for OpenSSL checking
195 proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
196 msg-checking "Checking for $msg..."
197 set rc 0
198 if {[is_mingw]} {
199 lappend libs -lgdi32 -lwsock32
200 }
201 if {[info exists ::zlib_lib]} {
202 lappend libs $::zlib_lib
203 }
204 msg-quiet cc-with [list -cflags $cflags -libs $libs] {
@@ -313,11 +313,11 @@
313 }
314 if {[info exists ::zlib_lib]} {
315 define-append LIBS $::zlib_lib
316 }
317 if {[is_mingw]} {
318 define-append LIBS -lgdi32 -lwsock32
319 }
320 msg-result "HTTPS support enabled"
321
322 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
323 if {[string match *-darwin* [get-define host]]} {
324
--- auto.def
+++ auto.def
@@ -194,11 +194,11 @@
194 # Helper for OpenSSL checking
195 proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
196 msg-checking "Checking for $msg..."
197 set rc 0
198 if {[is_mingw]} {
199 lappend libs -lgdi32 -lwsock32 -lcrypt32
200 }
201 if {[info exists ::zlib_lib]} {
202 lappend libs $::zlib_lib
203 }
204 msg-quiet cc-with [list -cflags $cflags -libs $libs] {
@@ -313,11 +313,11 @@
313 }
314 if {[info exists ::zlib_lib]} {
315 define-append LIBS $::zlib_lib
316 }
317 if {[is_mingw]} {
318 define-append LIBS -lgdi32 -lwsock32 -lcrypt32
319 }
320 msg-result "HTTPS support enabled"
321
322 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
323 if {[string match *-darwin* [get-define host]]} {
324
M src/makemake.tcl
+10 -10
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -645,13 +645,13 @@
645645
 ZLIBCONFIG =
646646
 ZLIBTARGETS =
647647
 endif
648648
649649
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
650
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
650
+# for SSLv3 (i.e. thereby forcing the use of TLS).
651651
 #
652
-SSLCONFIG += no-ssl2 no-ssl3 no-shared
652
+SSLCONFIG += no-ssl3 no-shared
653653
654654
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
655655
 # that Fossil knows about (i.e. the one within the source tree).
656656
 #
657657
 ifndef FOSSIL_ENABLE_MINIZ
@@ -855,11 +855,11 @@
855855
 endif
856856
857857
 #### OpenSSL: Add the necessary libraries required, if enabled.
858858
 #
859859
 ifdef FOSSIL_ENABLE_SSL
860
-LIB += -lssl -lcrypto -lgdi32
860
+LIB += -lssl -lcrypto -lgdi32 -lcrypt32
861861
 endif
862862
863863
 #### Tcl: Add the necessary libraries required, if enabled.
864864
 #
865865
 ifdef FOSSIL_ENABLE_TCL
@@ -1499,15 +1499,15 @@
14991499
 SSLLIBDIR = $(SSLDIR)\out32dll
15001500
 !else
15011501
 SSLLIBDIR = $(SSLDIR)\out32
15021502
 !endif
15031503
 SSLLFLAGS = /nologo /opt:ref /debug
1504
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1504
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
15051505
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
15061506
 !message Using 'x64' platform for OpenSSL...
15071507
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1508
-# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
1508
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3
15091509
 SSLCONFIG = VC-WIN64A no-asm
15101510
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15111511
 SSLCONFIG = $(SSLCONFIG) shared
15121512
 !else
15131513
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1518,16 +1518,16 @@
15181518
 !else
15191519
 SSLNMAKE = ms\nt.mak all
15201520
 !endif
15211521
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
15221522
 !if $(FOSSIL_DYNAMIC_BUILD)==0
1523
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1523
+SSLCFLAGS = -DOPENSSL_NO_SSL3
15241524
 !endif
15251525
 !elseif "$(PLATFORM)"=="ia64"
15261526
 !message Using 'ia64' platform for OpenSSL...
15271527
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1528
-# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
1528
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3
15291529
 SSLCONFIG = VC-WIN64I no-asm
15301530
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15311531
 SSLCONFIG = $(SSLCONFIG) shared
15321532
 !else
15331533
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1538,16 +1538,16 @@
15381538
 !else
15391539
 SSLNMAKE = ms\nt.mak all
15401540
 !endif
15411541
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
15421542
 !if $(FOSSIL_DYNAMIC_BUILD)==0
1543
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1543
+SSLCFLAGS = -DOPENSSL_NO_SSL3
15441544
 !endif
15451545
 !else
15461546
 !message Assuming 'x86' platform for OpenSSL...
15471547
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1548
-# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
1548
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3
15491549
 SSLCONFIG = VC-WIN32 no-asm
15501550
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15511551
 SSLCONFIG = $(SSLCONFIG) shared
15521552
 !else
15531553
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1558,11 +1558,11 @@
15581558
 !else
15591559
 SSLNMAKE = ms\nt.mak all
15601560
 !endif
15611561
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
15621562
 !if $(FOSSIL_DYNAMIC_BUILD)==0
1563
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1563
+SSLCFLAGS = -DOPENSSL_NO_SSL3
15641564
 !endif
15651565
 !endif
15661566
 !endif
15671567
15681568
 !if $(FOSSIL_ENABLE_TCL)!=0
15691569
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -645,13 +645,13 @@
645 ZLIBCONFIG =
646 ZLIBTARGETS =
647 endif
648
649 #### Disable creation of the OpenSSL shared libraries. Also, disable support
650 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
651 #
652 SSLCONFIG += no-ssl2 no-ssl3 no-shared
653
654 #### When using zlib, make sure that OpenSSL is configured to use the zlib
655 # that Fossil knows about (i.e. the one within the source tree).
656 #
657 ifndef FOSSIL_ENABLE_MINIZ
@@ -855,11 +855,11 @@
855 endif
856
857 #### OpenSSL: Add the necessary libraries required, if enabled.
858 #
859 ifdef FOSSIL_ENABLE_SSL
860 LIB += -lssl -lcrypto -lgdi32
861 endif
862
863 #### Tcl: Add the necessary libraries required, if enabled.
864 #
865 ifdef FOSSIL_ENABLE_TCL
@@ -1499,15 +1499,15 @@
1499 SSLLIBDIR = $(SSLDIR)\out32dll
1500 !else
1501 SSLLIBDIR = $(SSLDIR)\out32
1502 !endif
1503 SSLLFLAGS = /nologo /opt:ref /debug
1504 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1505 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1506 !message Using 'x64' platform for OpenSSL...
1507 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1508 # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
1509 SSLCONFIG = VC-WIN64A no-asm
1510 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1511 SSLCONFIG = $(SSLCONFIG) shared
1512 !else
1513 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1518,16 +1518,16 @@
1518 !else
1519 SSLNMAKE = ms\nt.mak all
1520 !endif
1521 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1522 !if $(FOSSIL_DYNAMIC_BUILD)==0
1523 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1524 !endif
1525 !elseif "$(PLATFORM)"=="ia64"
1526 !message Using 'ia64' platform for OpenSSL...
1527 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1528 # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
1529 SSLCONFIG = VC-WIN64I no-asm
1530 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1531 SSLCONFIG = $(SSLCONFIG) shared
1532 !else
1533 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1538,16 +1538,16 @@
1538 !else
1539 SSLNMAKE = ms\nt.mak all
1540 !endif
1541 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1542 !if $(FOSSIL_DYNAMIC_BUILD)==0
1543 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1544 !endif
1545 !else
1546 !message Assuming 'x86' platform for OpenSSL...
1547 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1548 # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
1549 SSLCONFIG = VC-WIN32 no-asm
1550 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1551 SSLCONFIG = $(SSLCONFIG) shared
1552 !else
1553 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1558,11 +1558,11 @@
1558 !else
1559 SSLNMAKE = ms\nt.mak all
1560 !endif
1561 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1562 !if $(FOSSIL_DYNAMIC_BUILD)==0
1563 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1564 !endif
1565 !endif
1566 !endif
1567
1568 !if $(FOSSIL_ENABLE_TCL)!=0
1569
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -645,13 +645,13 @@
645 ZLIBCONFIG =
646 ZLIBTARGETS =
647 endif
648
649 #### Disable creation of the OpenSSL shared libraries. Also, disable support
650 # for SSLv3 (i.e. thereby forcing the use of TLS).
651 #
652 SSLCONFIG += no-ssl3 no-shared
653
654 #### When using zlib, make sure that OpenSSL is configured to use the zlib
655 # that Fossil knows about (i.e. the one within the source tree).
656 #
657 ifndef FOSSIL_ENABLE_MINIZ
@@ -855,11 +855,11 @@
855 endif
856
857 #### OpenSSL: Add the necessary libraries required, if enabled.
858 #
859 ifdef FOSSIL_ENABLE_SSL
860 LIB += -lssl -lcrypto -lgdi32 -lcrypt32
861 endif
862
863 #### Tcl: Add the necessary libraries required, if enabled.
864 #
865 ifdef FOSSIL_ENABLE_TCL
@@ -1499,15 +1499,15 @@
1499 SSLLIBDIR = $(SSLDIR)\out32dll
1500 !else
1501 SSLLIBDIR = $(SSLDIR)\out32
1502 !endif
1503 SSLLFLAGS = /nologo /opt:ref /debug
1504 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1505 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1506 !message Using 'x64' platform for OpenSSL...
1507 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1508 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
1509 SSLCONFIG = VC-WIN64A no-asm
1510 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1511 SSLCONFIG = $(SSLCONFIG) shared
1512 !else
1513 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1518,16 +1518,16 @@
1518 !else
1519 SSLNMAKE = ms\nt.mak all
1520 !endif
1521 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1522 !if $(FOSSIL_DYNAMIC_BUILD)==0
1523 SSLCFLAGS = -DOPENSSL_NO_SSL3
1524 !endif
1525 !elseif "$(PLATFORM)"=="ia64"
1526 !message Using 'ia64' platform for OpenSSL...
1527 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1528 # SSLCONFIG = VC-WIN64I no-asm no-ssl3
1529 SSLCONFIG = VC-WIN64I no-asm
1530 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1531 SSLCONFIG = $(SSLCONFIG) shared
1532 !else
1533 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1538,16 +1538,16 @@
1538 !else
1539 SSLNMAKE = ms\nt.mak all
1540 !endif
1541 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1542 !if $(FOSSIL_DYNAMIC_BUILD)==0
1543 SSLCFLAGS = -DOPENSSL_NO_SSL3
1544 !endif
1545 !else
1546 !message Assuming 'x86' platform for OpenSSL...
1547 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1548 # SSLCONFIG = VC-WIN32 no-asm no-ssl3
1549 SSLCONFIG = VC-WIN32 no-asm
1550 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1551 SSLCONFIG = $(SSLCONFIG) shared
1552 !else
1553 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1558,11 +1558,11 @@
1558 !else
1559 SSLNMAKE = ms\nt.mak all
1560 !endif
1561 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1562 !if $(FOSSIL_DYNAMIC_BUILD)==0
1563 SSLCFLAGS = -DOPENSSL_NO_SSL3
1564 !endif
1565 !endif
1566 !endif
1567
1568 !if $(FOSSIL_ENABLE_TCL)!=0
1569
M win/Makefile.mingw
+3 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -154,13 +154,13 @@
154154
 ZLIBCONFIG =
155155
 ZLIBTARGETS =
156156
 endif
157157
158158
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
159
+# for SSLv3 (i.e. thereby forcing the use of TLS).
160160
 #
161
-SSLCONFIG += no-ssl2 no-ssl3 no-shared
161
+SSLCONFIG += no-ssl3 no-shared
162162
163163
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164164
 # that Fossil knows about (i.e. the one within the source tree).
165165
 #
166166
 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364364
 endif
365365
366366
 #### OpenSSL: Add the necessary libraries required, if enabled.
367367
 #
368368
 ifdef FOSSIL_ENABLE_SSL
369
-LIB += -lssl -lcrypto -lgdi32
369
+LIB += -lssl -lcrypto -lgdi32 -lcrypt32
370370
 endif
371371
372372
 #### Tcl: Add the necessary libraries required, if enabled.
373373
 #
374374
 ifdef FOSSIL_ENABLE_TCL
375375
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -154,13 +154,13 @@
154 ZLIBCONFIG =
155 ZLIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
161 SSLCONFIG += no-ssl2 no-ssl3 no-shared
162
163 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164 # that Fossil knows about (i.e. the one within the source tree).
165 #
166 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364 endif
365
366 #### OpenSSL: Add the necessary libraries required, if enabled.
367 #
368 ifdef FOSSIL_ENABLE_SSL
369 LIB += -lssl -lcrypto -lgdi32
370 endif
371
372 #### Tcl: Add the necessary libraries required, if enabled.
373 #
374 ifdef FOSSIL_ENABLE_TCL
375
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -154,13 +154,13 @@
154 ZLIBCONFIG =
155 ZLIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for SSLv3 (i.e. thereby forcing the use of TLS).
160 #
161 SSLCONFIG += no-ssl3 no-shared
162
163 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164 # that Fossil knows about (i.e. the one within the source tree).
165 #
166 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364 endif
365
366 #### OpenSSL: Add the necessary libraries required, if enabled.
367 #
368 ifdef FOSSIL_ENABLE_SSL
369 LIB += -lssl -lcrypto -lgdi32 -lcrypt32
370 endif
371
372 #### Tcl: Add the necessary libraries required, if enabled.
373 #
374 ifdef FOSSIL_ENABLE_TCL
375
M win/Makefile.mingw.mistachkin
+6 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,15 +17,15 @@
1717
 #
1818
1919
 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
2020
 # By default, this is an empty string (i.e. use the native compiler).
2121
 #
22
-PREFIX =
22
+# PREFIX =
2323
 # PREFIX = mingw32-
2424
 # PREFIX = i686-pc-mingw32-
2525
 # PREFIX = i686-w64-mingw32-
26
-# PREFIX = x86_64-w64-mingw32-
26
+PREFIX = x86_64-w64-mingw32-
2727
2828
 #### The toplevel directory of the source tree. Fossil can be built
2929
 # in a directory that is separate from the source tree. Just change
3030
 # the following to point from the build directory to the src/ folder.
3131
 #
@@ -63,15 +63,15 @@
6363
 FOSSIL_ENABLE_SSL = 1
6464
6565
 #### Automatically build OpenSSL when building Fossil (causes rebuild
6666
 # issues when building incrementally).
6767
 #
68
-# FOSSIL_BUILD_SSL = 1
68
+FOSSIL_BUILD_SSL = 1
6969
7070
 #### Enable relative paths in external diff/gdiff
7171
 #
72
-# FOSSIL_ENABLE_EXEC_REL_PATHS = 1
72
+FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
7474
 #### Enable legacy treatment of mv/rm (skip checkout files)
7575
 #
7676
 FOSSIL_ENABLE_LEGACY_MV_RM = 1
7777
@@ -156,11 +156,11 @@
156156
 endif
157157
158158
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159159
 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160160
 #
161
-SSLCONFIG += no-ssl2 no-ssl3 no-shared
161
+SSLCONFIG += no-ssl3 no-shared
162162
163163
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164164
 # that Fossil knows about (i.e. the one within the source tree).
165165
 #
166166
 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364364
 endif
365365
366366
 #### OpenSSL: Add the necessary libraries required, if enabled.
367367
 #
368368
 ifdef FOSSIL_ENABLE_SSL
369
-LIB += -lssl -lcrypto -lgdi32
369
+LIB += -lssl -lcrypto -lgdi32 -lcrypt32
370370
 endif
371371
372372
 #### Tcl: Add the necessary libraries required, if enabled.
373373
 #
374374
 ifdef FOSSIL_ENABLE_TCL
375375
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,15 +17,15 @@
17 #
18
19 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
20 # By default, this is an empty string (i.e. use the native compiler).
21 #
22 PREFIX =
23 # PREFIX = mingw32-
24 # PREFIX = i686-pc-mingw32-
25 # PREFIX = i686-w64-mingw32-
26 # PREFIX = x86_64-w64-mingw32-
27
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
@@ -63,15 +63,15 @@
63 FOSSIL_ENABLE_SSL = 1
64
65 #### Automatically build OpenSSL when building Fossil (causes rebuild
66 # issues when building incrementally).
67 #
68 # FOSSIL_BUILD_SSL = 1
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
@@ -156,11 +156,11 @@
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
161 SSLCONFIG += no-ssl2 no-ssl3 no-shared
162
163 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164 # that Fossil knows about (i.e. the one within the source tree).
165 #
166 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364 endif
365
366 #### OpenSSL: Add the necessary libraries required, if enabled.
367 #
368 ifdef FOSSIL_ENABLE_SSL
369 LIB += -lssl -lcrypto -lgdi32
370 endif
371
372 #### Tcl: Add the necessary libraries required, if enabled.
373 #
374 ifdef FOSSIL_ENABLE_TCL
375
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,15 +17,15 @@
17 #
18
19 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
20 # By default, this is an empty string (i.e. use the native compiler).
21 #
22 # PREFIX =
23 # PREFIX = mingw32-
24 # PREFIX = i686-pc-mingw32-
25 # PREFIX = i686-w64-mingw32-
26 PREFIX = x86_64-w64-mingw32-
27
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
@@ -63,15 +63,15 @@
63 FOSSIL_ENABLE_SSL = 1
64
65 #### Automatically build OpenSSL when building Fossil (causes rebuild
66 # issues when building incrementally).
67 #
68 FOSSIL_BUILD_SSL = 1
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
@@ -156,11 +156,11 @@
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
161 SSLCONFIG += no-ssl3 no-shared
162
163 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164 # that Fossil knows about (i.e. the one within the source tree).
165 #
166 ifndef FOSSIL_ENABLE_MINIZ
@@ -364,11 +364,11 @@
364 endif
365
366 #### OpenSSL: Add the necessary libraries required, if enabled.
367 #
368 ifdef FOSSIL_ENABLE_SSL
369 LIB += -lssl -lcrypto -lgdi32 -lcrypt32
370 endif
371
372 #### Tcl: Add the necessary libraries required, if enabled.
373 #
374 ifdef FOSSIL_ENABLE_TCL
375
M win/Makefile.msc
+7 -7
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -106,15 +106,15 @@
106106
 SSLLIBDIR = $(SSLDIR)\out32dll
107107
 !else
108108
 SSLLIBDIR = $(SSLDIR)\out32
109109
 !endif
110110
 SSLLFLAGS = /nologo /opt:ref /debug
111
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
111
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112112
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113113
 !message Using 'x64' platform for OpenSSL...
114114
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115
-# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
115
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3
116116
 SSLCONFIG = VC-WIN64A no-asm
117117
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118118
 SSLCONFIG = $(SSLCONFIG) shared
119119
 !else
120120
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -125,16 +125,16 @@
125125
 !else
126126
 SSLNMAKE = ms\nt.mak all
127127
 !endif
128128
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129129
 !if $(FOSSIL_DYNAMIC_BUILD)==0
130
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
130
+SSLCFLAGS = -DOPENSSL_NO_SSL3
131131
 !endif
132132
 !elseif "$(PLATFORM)"=="ia64"
133133
 !message Using 'ia64' platform for OpenSSL...
134134
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135
-# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
135
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3
136136
 SSLCONFIG = VC-WIN64I no-asm
137137
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138138
 SSLCONFIG = $(SSLCONFIG) shared
139139
 !else
140140
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -145,16 +145,16 @@
145145
 !else
146146
 SSLNMAKE = ms\nt.mak all
147147
 !endif
148148
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149149
 !if $(FOSSIL_DYNAMIC_BUILD)==0
150
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
150
+SSLCFLAGS = -DOPENSSL_NO_SSL3
151151
 !endif
152152
 !else
153153
 !message Assuming 'x86' platform for OpenSSL...
154154
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155
-# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
155
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3
156156
 SSLCONFIG = VC-WIN32 no-asm
157157
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158158
 SSLCONFIG = $(SSLCONFIG) shared
159159
 !else
160160
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -165,11 +165,11 @@
165165
 !else
166166
 SSLNMAKE = ms\nt.mak all
167167
 !endif
168168
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169169
 !if $(FOSSIL_DYNAMIC_BUILD)==0
170
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
170
+SSLCFLAGS = -DOPENSSL_NO_SSL3
171171
 !endif
172172
 !endif
173173
 !endif
174174
175175
 !if $(FOSSIL_ENABLE_TCL)!=0
176176
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -106,15 +106,15 @@
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -125,16 +125,16 @@
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -145,16 +145,16 @@
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -165,11 +165,11 @@
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
171 !endif
172 !endif
173 !endif
174
175 !if $(FOSSIL_ENABLE_TCL)!=0
176
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -106,15 +106,15 @@
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -125,16 +125,16 @@
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl3
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -145,16 +145,16 @@
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl3
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -165,11 +165,11 @@
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3
171 !endif
172 !endif
173 !endif
174
175 !if $(FOSSIL_ENABLE_TCL)!=0
176

Keyboard Shortcuts

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