Fossil SCM

Merge the Makefile changes for OpenSSL-1.1.

drh 2019-05-15 13:37 trunk merge
Commit e02ccb70d2465256904ba4fc6a3a096ec3b823bfef02e4dee1ec1b9c9a112767
Parent 5cc74bff9d113ae…
6 files changed +37 -74 +3 -3 +3 -3 +34 -71 +1 -1
~ Makefile.classic ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M Makefile.classic

No diff available

M src/makemake.tcl
+37 -74
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,13 +695,13 @@
695695
 ZLIBCONFIG =
696696
 ZLIBTARGETS =
697697
 endif
698698
699699
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
700
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
700
+# for SSLv3 (i.e. thereby forcing the use of TLS).
701701
 #
702
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
702
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
703703
704704
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
705705
 # that Fossil knows about (i.e. the one within the source tree).
706706
 #
707707
 ifndef FOSSIL_ENABLE_MINIZ
@@ -711,11 +711,11 @@
711711
 #### The directories where the OpenSSL include and library files are located.
712712
 # The recommended usage here is to use the Sysinternals junction tool
713713
 # to create a hard link between an "openssl-1.x" sub-directory of the
714714
 # Fossil source code directory and the target OpenSSL source directory.
715715
 #
716
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
716
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
717717
 OPENSSLINCDIR = $(OPENSSLDIR)/include
718718
 OPENSSLLIBDIR = $(OPENSSLDIR)
719719
720720
 #### Either the directory where the Tcl library is installed or the Tcl
721721
 # source code directory resides (depending on the value of the macro
@@ -1567,78 +1567,42 @@
15671567
 !ifndef USE_SEE
15681568
 USE_SEE = 0
15691569
 !endif
15701570
15711571
 !if $(FOSSIL_ENABLE_SSL)!=0
1572
-SSLDIR = $(B)\compat\openssl-1.0.2r
1573
-SSLINCDIR = $(SSLDIR)\inc32
1574
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1575
-SSLLIBDIR = $(SSLDIR)\out32dll
1576
-!else
1577
-SSLLIBDIR = $(SSLDIR)\out32
1578
-!endif
1579
-SSLLFLAGS = /nologo /opt:ref /debug
1580
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1581
-!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1582
-!message Using 'x64' platform for OpenSSL...
1583
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1584
-# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1585
-SSLCONFIG = VC-WIN64A no-asm
1586
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1587
-SSLCONFIG = $(SSLCONFIG) shared
1588
-!else
1589
-SSLCONFIG = $(SSLCONFIG) no-shared
1590
-!endif
1591
-SSLSETUP = ms\do_win64a.bat
1592
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1593
-SSLNMAKE = ms\ntdll.mak all
1594
-!else
1595
-SSLNMAKE = ms\nt.mak all
1596
-!endif
1597
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1598
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1599
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1600
-!endif
1601
-!elseif "$(PLATFORM)"=="ia64"
1602
-!message Using 'ia64' platform for OpenSSL...
1603
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1604
-# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1605
-SSLCONFIG = VC-WIN64I no-asm
1606
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1607
-SSLCONFIG = $(SSLCONFIG) shared
1608
-!else
1609
-SSLCONFIG = $(SSLCONFIG) no-shared
1610
-!endif
1611
-SSLSETUP = ms\do_win64i.bat
1612
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1613
-SSLNMAKE = ms\ntdll.mak all
1614
-!else
1615
-SSLNMAKE = ms\nt.mak all
1616
-!endif
1617
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1618
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1619
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1620
-!endif
1621
-!else
1622
-!message Assuming 'x86' platform for OpenSSL...
1623
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1624
-# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1625
-SSLCONFIG = VC-WIN32 no-asm
1626
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1627
-SSLCONFIG = $(SSLCONFIG) shared
1628
-!else
1629
-SSLCONFIG = $(SSLCONFIG) no-shared
1630
-!endif
1631
-SSLSETUP = ms\do_ms.bat
1632
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1633
-SSLNMAKE = ms\ntdll.mak all
1634
-!else
1635
-SSLNMAKE = ms\nt.mak all
1636
-!endif
1637
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1638
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1639
-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1572
+SSLDIR = $(B)\compat\openssl-1.1.1b
1573
+SSLINCDIR = $(SSLDIR)\include
1574
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1575
+SSLLIBDIR = $(SSLDIR)
1576
+!else
1577
+SSLLIBDIR = $(SSLDIR)
1578
+!endif
1579
+SSLLFLAGS = /nologo /opt:ref /debug
1580
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1581
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1582
+!message Using 'x64' platform for OpenSSL...
1583
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1585
+SSLCONFIG = $(SSLCONFIG) shared
1586
+!else
1587
+SSLCONFIG = $(SSLCONFIG) no-shared
1588
+!endif
1589
+!elseif "$(PLATFORM)"=="ia64"
1590
+!message Using 'ia64' platform for OpenSSL...
1591
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1592
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1593
+SSLCONFIG = $(SSLCONFIG) shared
1594
+!else
1595
+SSLCONFIG = $(SSLCONFIG) no-shared
1596
+!endif
1597
+!else
1598
+!message Assuming 'x86' platform for OpenSSL...
1599
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1600
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1601
+SSLCONFIG = $(SSLCONFIG) shared
1602
+!else
1603
+SSLCONFIG = $(SSLCONFIG) no-shared
16401604
 !endif
16411605
 !endif
16421606
 !endif
16431607
16441608
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1857,15 +1821,14 @@
18571821
 @echo Building OpenSSL from "$(SSLDIR)"...
18581822
 !if "$(PERLDIR)" != ""
18591823
 @set PATH=$(PERLDIR);$(PATH)
18601824
 !endif
18611825
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1862
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
18631826
 !if $(FOSSIL_ENABLE_WINXP)!=0
1864
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1827
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
18651828
 !else
1866
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1829
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
18671830
 !endif
18681831
 !endif
18691832
18701833
 !if $(FOSSIL_ENABLE_MINIZ)==0
18711834
 !if $(FOSSIL_BUILD_ZLIB)!=0
18721835
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,13 +695,13 @@
695 ZLIBCONFIG =
696 ZLIBTARGETS =
697 endif
698
699 #### Disable creation of the OpenSSL shared libraries. Also, disable support
700 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
701 #
702 SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
703
704 #### When using zlib, make sure that OpenSSL is configured to use the zlib
705 # that Fossil knows about (i.e. the one within the source tree).
706 #
707 ifndef FOSSIL_ENABLE_MINIZ
@@ -711,11 +711,11 @@
711 #### The directories where the OpenSSL include and library files are located.
712 # The recommended usage here is to use the Sysinternals junction tool
713 # to create a hard link between an "openssl-1.x" sub-directory of the
714 # Fossil source code directory and the target OpenSSL source directory.
715 #
716 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
717 OPENSSLINCDIR = $(OPENSSLDIR)/include
718 OPENSSLLIBDIR = $(OPENSSLDIR)
719
720 #### Either the directory where the Tcl library is installed or the Tcl
721 # source code directory resides (depending on the value of the macro
@@ -1567,78 +1567,42 @@
1567 !ifndef USE_SEE
1568 USE_SEE = 0
1569 !endif
1570
1571 !if $(FOSSIL_ENABLE_SSL)!=0
1572 SSLDIR = $(B)\compat\openssl-1.0.2r
1573 SSLINCDIR = $(SSLDIR)\inc32
1574 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1575 SSLLIBDIR = $(SSLDIR)\out32dll
1576 !else
1577 SSLLIBDIR = $(SSLDIR)\out32
1578 !endif
1579 SSLLFLAGS = /nologo /opt:ref /debug
1580 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1581 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1582 !message Using 'x64' platform for OpenSSL...
1583 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1584 # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1585 SSLCONFIG = VC-WIN64A no-asm
1586 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1587 SSLCONFIG = $(SSLCONFIG) shared
1588 !else
1589 SSLCONFIG = $(SSLCONFIG) no-shared
1590 !endif
1591 SSLSETUP = ms\do_win64a.bat
1592 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1593 SSLNMAKE = ms\ntdll.mak all
1594 !else
1595 SSLNMAKE = ms\nt.mak all
1596 !endif
1597 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1598 !if $(FOSSIL_DYNAMIC_BUILD)==0
1599 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1600 !endif
1601 !elseif "$(PLATFORM)"=="ia64"
1602 !message Using 'ia64' platform for OpenSSL...
1603 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1604 # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1605 SSLCONFIG = VC-WIN64I no-asm
1606 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1607 SSLCONFIG = $(SSLCONFIG) shared
1608 !else
1609 SSLCONFIG = $(SSLCONFIG) no-shared
1610 !endif
1611 SSLSETUP = ms\do_win64i.bat
1612 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1613 SSLNMAKE = ms\ntdll.mak all
1614 !else
1615 SSLNMAKE = ms\nt.mak all
1616 !endif
1617 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1618 !if $(FOSSIL_DYNAMIC_BUILD)==0
1619 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1620 !endif
1621 !else
1622 !message Assuming 'x86' platform for OpenSSL...
1623 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1624 # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1625 SSLCONFIG = VC-WIN32 no-asm
1626 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1627 SSLCONFIG = $(SSLCONFIG) shared
1628 !else
1629 SSLCONFIG = $(SSLCONFIG) no-shared
1630 !endif
1631 SSLSETUP = ms\do_ms.bat
1632 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1633 SSLNMAKE = ms\ntdll.mak all
1634 !else
1635 SSLNMAKE = ms\nt.mak all
1636 !endif
1637 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1638 !if $(FOSSIL_DYNAMIC_BUILD)==0
1639 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1640 !endif
1641 !endif
1642 !endif
1643
1644 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1857,15 +1821,14 @@
1857 @echo Building OpenSSL from "$(SSLDIR)"...
1858 !if "$(PERLDIR)" != ""
1859 @set PATH=$(PERLDIR);$(PATH)
1860 !endif
1861 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1862 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1863 !if $(FOSSIL_ENABLE_WINXP)!=0
1864 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1865 !else
1866 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1867 !endif
1868 !endif
1869
1870 !if $(FOSSIL_ENABLE_MINIZ)==0
1871 !if $(FOSSIL_BUILD_ZLIB)!=0
1872
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,13 +695,13 @@
695 ZLIBCONFIG =
696 ZLIBTARGETS =
697 endif
698
699 #### Disable creation of the OpenSSL shared libraries. Also, disable support
700 # for SSLv3 (i.e. thereby forcing the use of TLS).
701 #
702 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
703
704 #### When using zlib, make sure that OpenSSL is configured to use the zlib
705 # that Fossil knows about (i.e. the one within the source tree).
706 #
707 ifndef FOSSIL_ENABLE_MINIZ
@@ -711,11 +711,11 @@
711 #### The directories where the OpenSSL include and library files are located.
712 # The recommended usage here is to use the Sysinternals junction tool
713 # to create a hard link between an "openssl-1.x" sub-directory of the
714 # Fossil source code directory and the target OpenSSL source directory.
715 #
716 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
717 OPENSSLINCDIR = $(OPENSSLDIR)/include
718 OPENSSLLIBDIR = $(OPENSSLDIR)
719
720 #### Either the directory where the Tcl library is installed or the Tcl
721 # source code directory resides (depending on the value of the macro
@@ -1567,78 +1567,42 @@
1567 !ifndef USE_SEE
1568 USE_SEE = 0
1569 !endif
1570
1571 !if $(FOSSIL_ENABLE_SSL)!=0
1572 SSLDIR = $(B)\compat\openssl-1.1.1b
1573 SSLINCDIR = $(SSLDIR)\include
1574 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1575 SSLLIBDIR = $(SSLDIR)
1576 !else
1577 SSLLIBDIR = $(SSLDIR)
1578 !endif
1579 SSLLFLAGS = /nologo /opt:ref /debug
1580 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1581 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1582 !message Using 'x64' platform for OpenSSL...
1583 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1585 SSLCONFIG = $(SSLCONFIG) shared
1586 !else
1587 SSLCONFIG = $(SSLCONFIG) no-shared
1588 !endif
1589 !elseif "$(PLATFORM)"=="ia64"
1590 !message Using 'ia64' platform for OpenSSL...
1591 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1592 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1593 SSLCONFIG = $(SSLCONFIG) shared
1594 !else
1595 SSLCONFIG = $(SSLCONFIG) no-shared
1596 !endif
1597 !else
1598 !message Assuming 'x86' platform for OpenSSL...
1599 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1600 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1601 SSLCONFIG = $(SSLCONFIG) shared
1602 !else
1603 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1604 !endif
1605 !endif
1606 !endif
1607
1608 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1857,15 +1821,14 @@
1821 @echo Building OpenSSL from "$(SSLDIR)"...
1822 !if "$(PERLDIR)" != ""
1823 @set PATH=$(PERLDIR);$(PATH)
1824 !endif
1825 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
1826 !if $(FOSSIL_ENABLE_WINXP)!=0
1827 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1828 !else
1829 @pushd "$(SSLDIR)" && $(MAKE) && popd
1830 !endif
1831 !endif
1832
1833 !if $(FOSSIL_ENABLE_MINIZ)==0
1834 !if $(FOSSIL_BUILD_ZLIB)!=0
1835
M win/Makefile.mingw
+3 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.mingw.mistachkin
+3 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.msc
+34 -71
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.0.2r
104
-SSLINCDIR = $(SSLDIR)\inc32
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
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-ssl2 no-ssl3 no-weak-ssl-ciphers
116
-SSLCONFIG = VC-WIN64A no-asm
117
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
118
-SSLCONFIG = $(SSLCONFIG) shared
119
-!else
120
-SSLCONFIG = $(SSLCONFIG) no-shared
121
-!endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
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 no-weak-ssl-ciphers
136
-SSLCONFIG = VC-WIN64I no-asm
137
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
138
-SSLCONFIG = $(SSLCONFIG) shared
139
-!else
140
-SSLCONFIG = $(SSLCONFIG) no-shared
141
-!endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
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 no-weak-ssl-ciphers
156
-SSLCONFIG = VC-WIN32 no-asm
157
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
158
-SSLCONFIG = $(SSLCONFIG) shared
159
-!else
160
-SSLCONFIG = $(SSLCONFIG) no-shared
161
-!endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
103
+SSLDIR = $(B)\compat\openssl-1.1.1b
104
+SSLINCDIR = $(SSLDIR)\include
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)
107
+!else
108
+SSLLIBDIR = $(SSLDIR)
109
+!endif
110
+SSLLFLAGS = /nologo /opt:ref /debug
111
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
+!message Using 'x64' platform for OpenSSL...
114
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
116
+SSLCONFIG = $(SSLCONFIG) shared
117
+!else
118
+SSLCONFIG = $(SSLCONFIG) no-shared
119
+!endif
120
+!elseif "$(PLATFORM)"=="ia64"
121
+!message Using 'ia64' platform for OpenSSL...
122
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLCONFIG = $(SSLCONFIG) shared
125
+!else
126
+SSLCONFIG = $(SSLCONFIG) no-shared
127
+!endif
128
+!else
129
+!message Assuming 'x86' platform for OpenSSL...
130
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
132
+SSLCONFIG = $(SSLCONFIG) shared
133
+!else
134
+SSLCONFIG = $(SSLCONFIG) no-shared
171135
 !endif
172136
 !endif
173137
 !endif
174138
175139
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -760,15 +724,14 @@
760724
 @echo Building OpenSSL from "$(SSLDIR)"...
761725
 !if "$(PERLDIR)" != ""
762726
 @set PATH=$(PERLDIR);$(PATH)
763727
 !endif
764728
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
765
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
766729
 !if $(FOSSIL_ENABLE_WINXP)!=0
767
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
730
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
768731
 !else
769
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
732
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
770733
 !endif
771734
 !endif
772735
773736
 !if $(FOSSIL_ENABLE_MINIZ)==0
774737
 !if $(FOSSIL_BUILD_ZLIB)!=0
775738
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.0.2r
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
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-ssl2 no-ssl3 no-weak-ssl-ciphers
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
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 no-weak-ssl-ciphers
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
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 no-weak-ssl-ciphers
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
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 -DOPENSSL_NO_WEAK_SSL_CIPHERS
171 !endif
172 !endif
173 !endif
174
175 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -760,15 +724,14 @@
760 @echo Building OpenSSL from "$(SSLDIR)"...
761 !if "$(PERLDIR)" != ""
762 @set PATH=$(PERLDIR);$(PATH)
763 !endif
764 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
765 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
766 !if $(FOSSIL_ENABLE_WINXP)!=0
767 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
768 !else
769 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
770 !endif
771 !endif
772
773 !if $(FOSSIL_ENABLE_MINIZ)==0
774 !if $(FOSSIL_BUILD_ZLIB)!=0
775
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1b
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115 !if $(FOSSIL_DYNAMIC_BUILD)!=0
116 SSLCONFIG = $(SSLCONFIG) shared
117 !else
118 SSLCONFIG = $(SSLCONFIG) no-shared
119 !endif
120 !elseif "$(PLATFORM)"=="ia64"
121 !message Using 'ia64' platform for OpenSSL...
122 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLCONFIG = $(SSLCONFIG) shared
125 !else
126 SSLCONFIG = $(SSLCONFIG) no-shared
127 !endif
128 !else
129 !message Assuming 'x86' platform for OpenSSL...
130 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131 !if $(FOSSIL_DYNAMIC_BUILD)!=0
132 SSLCONFIG = $(SSLCONFIG) shared
133 !else
134 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
135 !endif
136 !endif
137 !endif
138
139 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -760,15 +724,14 @@
724 @echo Building OpenSSL from "$(SSLDIR)"...
725 !if "$(PERLDIR)" != ""
726 @set PATH=$(PERLDIR);$(PATH)
727 !endif
728 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
729 !if $(FOSSIL_ENABLE_WINXP)!=0
730 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
731 !else
732 @pushd "$(SSLDIR)" && $(MAKE) && popd
733 !endif
734 !endif
735
736 !if $(FOSSIL_ENABLE_MINIZ)==0
737 !if $(FOSSIL_BUILD_ZLIB)!=0
738
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161161
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162162
 first <a href="https://www.openssl.org/source/">download the official
163163
 source code for OpenSSL</a> and extract it to an appropriately named
164164
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165165
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166
-"<b>compat/openssl-1.0.2r</b>"), then make sure that some recent
166
+"<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
167167
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168168
 and finally run one of the following commands:
169169
 <blockquote><pre>
170170
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171171
 </pre></blockquote>
172172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.0.2r</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172

Keyboard Shortcuts

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