Fossil

Check-in [8ac66ef3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bad-merge
Files: files | file ages | folders
SHA3-256: 8ac66ef33b464d280e9ec00e3b5223b1c2c78a056405348dcd4d255fc226923c
User & Date: drh 2019-05-18 20:50:06
Original Comment: Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now.
Context
2019-05-18
20:55
Merge the windows build fix from trunk. Closed-Leaf check-in: d99debe8 user: drh tags: bad-merge
20:50
Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch. check-in: 8ac66ef3 user: drh tags: bad-merge
00:19
Fix harmless compiler warning. check-in: 420244cb user: mistachkin tags: trunk
2019-05-17
23:34
On Windows, avoid using BIO_ptr_ctrl with OpenSSL 1.1.1b as it does not appear to work as expected. check-in: 344a3331 user: mistachkin tags: trunk
2019-05-13
21:48
Merge trunk Closed-Leaf check-in: 91a0d5a5 user: jan.nijtmans tags: openssl-1.1
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/makemake.tcl.

823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
....
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1
TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif
................................................................................
TCC       = $(TCC) /DFOSSIL_ENABLE_JSON=1
RCC       = $(RCC) /DFOSSIL_ENABLE_JSON=1
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_SSL=1
RCC       = $(RCC) /DFOSSIL_ENABLE_SSL=1
TCC       = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
RCC       = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
LIBS      = $(LIBS) $(SSLLIB)
LIBDIR    = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
!endif

!if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC       = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1







<
<







 







<
<







823
824
825
826
827
828
829


830
831
832
833
834
835
836
....
1703
1704
1705
1706
1707
1708
1709


1710
1711
1712
1713
1714
1715
1716
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1


endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif
................................................................................
TCC       = $(TCC) /DFOSSIL_ENABLE_JSON=1
RCC       = $(RCC) /DFOSSIL_ENABLE_JSON=1
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_SSL=1
RCC       = $(RCC) /DFOSSIL_ENABLE_SSL=1


LIBS      = $(LIBS) $(SSLLIB)
LIBDIR    = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
!endif

!if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC       = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1

Changes to win/Makefile.mingw.

286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1
TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif







<
<







286
287
288
289
290
291
292


293
294
295
296
297
298
299
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1


endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif

Changes to win/Makefile.mingw.mistachkin.

286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1
TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif







<
<







286
287
288
289
290
291
292


293
294
295
296
297
298
299
RCC += -DBROKEN_MINGW_CMDLINE=1
endif

# With HTTPS support
ifdef FOSSIL_ENABLE_SSL
TCC += -DFOSSIL_ENABLE_SSL=1
RCC += -DFOSSIL_ENABLE_SSL=1


endif

# With relative paths in external diff/gdiff
ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
endif

Changes to win/Makefile.msc.

233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
TCC       = $(TCC) /DFOSSIL_ENABLE_JSON=1
RCC       = $(RCC) /DFOSSIL_ENABLE_JSON=1
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_SSL=1
RCC       = $(RCC) /DFOSSIL_ENABLE_SSL=1
TCC       = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
RCC       = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
LIBS      = $(LIBS) $(SSLLIB)
LIBDIR    = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
!endif

!if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC       = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1







<
<







233
234
235
236
237
238
239


240
241
242
243
244
245
246
TCC       = $(TCC) /DFOSSIL_ENABLE_JSON=1
RCC       = $(RCC) /DFOSSIL_ENABLE_JSON=1
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_SSL=1
RCC       = $(RCC) /DFOSSIL_ENABLE_SSL=1


LIBS      = $(LIBS) $(SSLLIB)
LIBDIR    = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
!endif

!if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
TCC       = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
RCC       = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1