Fossil SCM
Fix for MSVC changes from the previous check-in: work around issue in OpenSSL where it will not link when SSLv2 and SSLv3 are disabled (i.e. it ends up not building 'ssleay32.lib' at all).
Commit
479805e1ec7f6c43997b47ced8c26f0e20e1ac2c
Parent
1f91d041bf37f59…
2 files changed
+14
-5
+14
-5
+14
-5
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1312,23 +1312,32 @@ | ||
| 1312 | 1312 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1313 | 1313 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1314 | 1314 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1315 | 1315 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1316 | 1316 | !message Using 'x64' platform for OpenSSL... |
| 1317 | -SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared | |
| 1317 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 1318 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared | |
| 1319 | +SSLCONFIG = VC-WIN64A no-asm no-shared | |
| 1318 | 1320 | SSLSETUP = ms\do_win64a.bat |
| 1319 | 1321 | SSLNMAKE = ms\nt.mak all |
| 1322 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1320 | 1323 | !elseif "$(PLATFORM)"=="ia64" |
| 1321 | 1324 | !message Using 'ia64' platform for OpenSSL... |
| 1322 | -SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared | |
| 1325 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 1326 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared | |
| 1327 | +SSLCONFIG = VC-WIN64I no-asm no-shared | |
| 1323 | 1328 | SSLSETUP = ms\do_win64i.bat |
| 1324 | 1329 | SSLNMAKE = ms\nt.mak all |
| 1330 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1325 | 1331 | !else |
| 1326 | 1332 | !message Assuming 'x86' platform for OpenSSL... |
| 1327 | -SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared | |
| 1333 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 1334 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared | |
| 1335 | +SSLCONFIG = VC-WIN32 no-asm no-shared | |
| 1328 | 1336 | SSLSETUP = ms\do_ms.bat |
| 1329 | 1337 | SSLNMAKE = ms\nt.mak all |
| 1338 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1330 | 1339 | !endif |
| 1331 | 1340 | !endif |
| 1332 | 1341 | |
| 1333 | 1342 | !ifdef FOSSIL_ENABLE_TCL |
| 1334 | 1343 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1497,13 +1506,13 @@ | ||
| 1497 | 1506 | @set PATH=$(PERLDIR);$(PATH) |
| 1498 | 1507 | !endif |
| 1499 | 1508 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 1500 | 1509 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1501 | 1510 | !ifdef FOSSIL_ENABLE_WINXP |
| 1502 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd | |
| 1511 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd | |
| 1503 | 1512 | !else |
| 1504 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd | |
| 1513 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd | |
| 1505 | 1514 | !endif |
| 1506 | 1515 | !endif |
| 1507 | 1516 | |
| 1508 | 1517 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1509 | 1518 | APPTARGETS = $(APPTARGETS) zlib |
| 1510 | 1519 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1312,23 +1312,32 @@ | |
| 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 | !ifdef FOSSIL_ENABLE_TCL |
| 1334 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1497,13 +1506,13 @@ | |
| 1497 | @set PATH=$(PERLDIR);$(PATH) |
| 1498 | !endif |
| 1499 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 1500 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1501 | !ifdef FOSSIL_ENABLE_WINXP |
| 1502 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd |
| 1503 | !else |
| 1504 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd |
| 1505 | !endif |
| 1506 | !endif |
| 1507 | |
| 1508 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1509 | APPTARGETS = $(APPTARGETS) zlib |
| 1510 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1312,23 +1312,32 @@ | |
| 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 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 1318 | # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared |
| 1319 | SSLCONFIG = VC-WIN64A no-asm no-shared |
| 1320 | SSLSETUP = ms\do_win64a.bat |
| 1321 | SSLNMAKE = ms\nt.mak all |
| 1322 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1323 | !elseif "$(PLATFORM)"=="ia64" |
| 1324 | !message Using 'ia64' platform for OpenSSL... |
| 1325 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 1326 | # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared |
| 1327 | SSLCONFIG = VC-WIN64I no-asm no-shared |
| 1328 | SSLSETUP = ms\do_win64i.bat |
| 1329 | SSLNMAKE = ms\nt.mak all |
| 1330 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1331 | !else |
| 1332 | !message Assuming 'x86' platform for OpenSSL... |
| 1333 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 1334 | # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared |
| 1335 | SSLCONFIG = VC-WIN32 no-asm no-shared |
| 1336 | SSLSETUP = ms\do_ms.bat |
| 1337 | SSLNMAKE = ms\nt.mak all |
| 1338 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1339 | !endif |
| 1340 | !endif |
| 1341 | |
| 1342 | !ifdef FOSSIL_ENABLE_TCL |
| 1343 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1497,13 +1506,13 @@ | |
| 1506 | @set PATH=$(PERLDIR);$(PATH) |
| 1507 | !endif |
| 1508 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 1509 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1510 | !ifdef FOSSIL_ENABLE_WINXP |
| 1511 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd |
| 1512 | !else |
| 1513 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd |
| 1514 | !endif |
| 1515 | !endif |
| 1516 | |
| 1517 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1518 | APPTARGETS = $(APPTARGETS) zlib |
| 1519 |
+14
-5
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -62,23 +62,32 @@ | ||
| 62 | 62 | SSLLIBDIR = $(SSLDIR)\out32 |
| 63 | 63 | SSLLFLAGS = /nologo /opt:ref /debug |
| 64 | 64 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 65 | 65 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 66 | 66 | !message Using 'x64' platform for OpenSSL... |
| 67 | -SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared | |
| 67 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 68 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared | |
| 69 | +SSLCONFIG = VC-WIN64A no-asm no-shared | |
| 68 | 70 | SSLSETUP = ms\do_win64a.bat |
| 69 | 71 | SSLNMAKE = ms\nt.mak all |
| 72 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 70 | 73 | !elseif "$(PLATFORM)"=="ia64" |
| 71 | 74 | !message Using 'ia64' platform for OpenSSL... |
| 72 | -SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared | |
| 75 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 76 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared | |
| 77 | +SSLCONFIG = VC-WIN64I no-asm no-shared | |
| 73 | 78 | SSLSETUP = ms\do_win64i.bat |
| 74 | 79 | SSLNMAKE = ms\nt.mak all |
| 80 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 75 | 81 | !else |
| 76 | 82 | !message Assuming 'x86' platform for OpenSSL... |
| 77 | -SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared | |
| 83 | +# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. | |
| 84 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared | |
| 85 | +SSLCONFIG = VC-WIN32 no-asm no-shared | |
| 78 | 86 | SSLSETUP = ms\do_ms.bat |
| 79 | 87 | SSLNMAKE = ms\nt.mak all |
| 88 | +SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 80 | 89 | !endif |
| 81 | 90 | !endif |
| 82 | 91 | |
| 83 | 92 | !ifdef FOSSIL_ENABLE_TCL |
| 84 | 93 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -467,13 +476,13 @@ | ||
| 467 | 476 | @set PATH=$(PERLDIR);$(PATH) |
| 468 | 477 | !endif |
| 469 | 478 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 470 | 479 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 471 | 480 | !ifdef FOSSIL_ENABLE_WINXP |
| 472 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd | |
| 481 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd | |
| 473 | 482 | !else |
| 474 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd | |
| 483 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd | |
| 475 | 484 | !endif |
| 476 | 485 | !endif |
| 477 | 486 | |
| 478 | 487 | !ifndef FOSSIL_ENABLE_MINIZ |
| 479 | 488 | APPTARGETS = $(APPTARGETS) zlib |
| 480 | 489 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -62,23 +62,32 @@ | |
| 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 | !ifdef FOSSIL_ENABLE_TCL |
| 84 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -467,13 +476,13 @@ | |
| 467 | @set PATH=$(PERLDIR);$(PATH) |
| 468 | !endif |
| 469 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 470 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 471 | !ifdef FOSSIL_ENABLE_WINXP |
| 472 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd |
| 473 | !else |
| 474 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd |
| 475 | !endif |
| 476 | !endif |
| 477 | |
| 478 | !ifndef FOSSIL_ENABLE_MINIZ |
| 479 | APPTARGETS = $(APPTARGETS) zlib |
| 480 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -62,23 +62,32 @@ | |
| 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 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 68 | # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared |
| 69 | SSLCONFIG = VC-WIN64A no-asm no-shared |
| 70 | SSLSETUP = ms\do_win64a.bat |
| 71 | SSLNMAKE = ms\nt.mak all |
| 72 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 73 | !elseif "$(PLATFORM)"=="ia64" |
| 74 | !message Using 'ia64' platform for OpenSSL... |
| 75 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 76 | # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared |
| 77 | SSLCONFIG = VC-WIN64I no-asm no-shared |
| 78 | SSLSETUP = ms\do_win64i.bat |
| 79 | SSLNMAKE = ms\nt.mak all |
| 80 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 81 | !else |
| 82 | !message Assuming 'x86' platform for OpenSSL... |
| 83 | # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build. |
| 84 | # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared |
| 85 | SSLCONFIG = VC-WIN32 no-asm no-shared |
| 86 | SSLSETUP = ms\do_ms.bat |
| 87 | SSLNMAKE = ms\nt.mak all |
| 88 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 89 | !endif |
| 90 | !endif |
| 91 | |
| 92 | !ifdef FOSSIL_ENABLE_TCL |
| 93 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -467,13 +476,13 @@ | |
| 476 | @set PATH=$(PERLDIR);$(PATH) |
| 477 | !endif |
| 478 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 479 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 480 | !ifdef FOSSIL_ENABLE_WINXP |
| 481 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd |
| 482 | !else |
| 483 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd |
| 484 | !endif |
| 485 | !endif |
| 486 | |
| 487 | !ifndef FOSSIL_ENABLE_MINIZ |
| 488 | APPTARGETS = $(APPTARGETS) zlib |
| 489 |