Fossil SCM

On non-MSVC-platforms (including MinGW), dynamic builds are already the default, so let "fossil version -v" reflect that.

jan.nijtmans 2015-06-17 10:10 UTC dynamicMsvc
Commit b2c03de312803c70ecf02cf8af483da13efec28b
Parent b463e469951507d…
5 files changed +7 -5 +3 +7 -4 +7 -4 +7 -4
~ Makefile.classic ~ auto.def ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M Makefile.classic
+7 -5
--- Makefile.classic
+++ Makefile.classic
@@ -41,24 +41,26 @@
4141
 # FOSSIL_ENABLE_MINIZ = 1
4242
 # TCC += -DFOSSIL_ENABLE_MINIZ
4343
4444
 # To add support for HTTPS
4545
 TCC += -DFOSSIL_ENABLE_SSL
46
+
47
+#### We sometimes add the -static option here so that we can build a
48
+# static executable that will run in a chroot jail.
49
+#LIB = -static
50
+TCC += -DFOSSIL_DYNAMIC_BUILD=1
4651
4752
 #### Extra arguments for linking the finished binary. Fossil needs
4853
 # to link against the Z-Lib compression library unless the miniz
4954
 # library in the source tree is being used. There are no other
50
-# required dependencies. We sometimes add the -static option
51
-# here so that we can build a static executable that will run in
52
-# a chroot jail.
53
-#
55
+# required dependencies.
5456
 ZLIB_LIB.0 = -lz
5557
 ZLIB_LIB.1 =
5658
 ZLIB_LIB. = $(ZLIB_LIB.0)
5759
5860
 # If using zlib:
59
-LIB = $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
61
+LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
6062
6163
 # If using HTTPS:
6264
 LIB += -lcrypto -lssl
6365
6466
 #### Tcl shell for use in running the fossil testsuite. If you do not
6567
--- Makefile.classic
+++ Makefile.classic
@@ -41,24 +41,26 @@
41 # FOSSIL_ENABLE_MINIZ = 1
42 # TCC += -DFOSSIL_ENABLE_MINIZ
43
44 # To add support for HTTPS
45 TCC += -DFOSSIL_ENABLE_SSL
 
 
 
 
 
46
47 #### Extra arguments for linking the finished binary. Fossil needs
48 # to link against the Z-Lib compression library unless the miniz
49 # library in the source tree is being used. There are no other
50 # required dependencies. We sometimes add the -static option
51 # here so that we can build a static executable that will run in
52 # a chroot jail.
53 #
54 ZLIB_LIB.0 = -lz
55 ZLIB_LIB.1 =
56 ZLIB_LIB. = $(ZLIB_LIB.0)
57
58 # If using zlib:
59 LIB = $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
60
61 # If using HTTPS:
62 LIB += -lcrypto -lssl
63
64 #### Tcl shell for use in running the fossil testsuite. If you do not
65
--- Makefile.classic
+++ Makefile.classic
@@ -41,24 +41,26 @@
41 # FOSSIL_ENABLE_MINIZ = 1
42 # TCC += -DFOSSIL_ENABLE_MINIZ
43
44 # To add support for HTTPS
45 TCC += -DFOSSIL_ENABLE_SSL
46
47 #### We sometimes add the -static option here so that we can build a
48 # static executable that will run in a chroot jail.
49 #LIB = -static
50 TCC += -DFOSSIL_DYNAMIC_BUILD=1
51
52 #### Extra arguments for linking the finished binary. Fossil needs
53 # to link against the Z-Lib compression library unless the miniz
54 # library in the source tree is being used. There are no other
55 # required dependencies.
 
 
 
56 ZLIB_LIB.0 = -lz
57 ZLIB_LIB.1 =
58 ZLIB_LIB. = $(ZLIB_LIB.0)
59
60 # If using zlib:
61 LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
62
63 # If using HTTPS:
64 LIB += -lcrypto -lssl
65
66 #### Tcl shell for use in running the fossil testsuite. If you do not
67
M auto.def
+3
--- auto.def
+++ auto.def
@@ -113,10 +113,13 @@
113113
114114
 if {[opt-bool static]} {
115115
 # XXX: This will not work on all systems.
116116
 define-append EXTRA_LDFLAGS -static
117117
 msg-result "Trying to link statically"
118
+} else {
119
+ define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
120
+ define FOSSIL_DYNAMIC_BUILD
118121
 }
119122
120123
 set tclpath [opt-val with-tcl]
121124
 if {$tclpath ne ""} {
122125
 set tclprivatestubs [opt-bool with-tcl-private-stubs]
123126
--- auto.def
+++ auto.def
@@ -113,10 +113,13 @@
113
114 if {[opt-bool static]} {
115 # XXX: This will not work on all systems.
116 define-append EXTRA_LDFLAGS -static
117 msg-result "Trying to link statically"
 
 
 
118 }
119
120 set tclpath [opt-val with-tcl]
121 if {$tclpath ne ""} {
122 set tclprivatestubs [opt-bool with-tcl-private-stubs]
123
--- auto.def
+++ auto.def
@@ -113,10 +113,13 @@
113
114 if {[opt-bool static]} {
115 # XXX: This will not work on all systems.
116 define-append EXTRA_LDFLAGS -static
117 msg-result "Trying to link statically"
118 } else {
119 define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
120 define FOSSIL_DYNAMIC_BUILD
121 }
122
123 set tclpath [opt-val with-tcl]
124 if {$tclpath ne ""} {
125 set tclprivatestubs [opt-bool with-tcl-private-stubs]
126
M src/makemake.tcl
+7 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,14 +745,17 @@
745745
 ifdef FOSSIL_ENABLE_JSON
746746
 TCC += -DFOSSIL_ENABLE_JSON=1
747747
 RCC += -DFOSSIL_ENABLE_JSON=1
748748
 endif
749749
750
-#### We add the -static option here so that we can build a static
751
-# executable that will run in a chroot jail.
752
-#
753
-LIB = -static
750
+#### The option -static has no effect on mingw(-w64), only
751
+# dynamic executables can be built linking with msvcrt.dll.
752
+# Openssl (optional) and zlib however are always linked in
753
+# statically.
754
+#LIB = -static
755
+TCC += -DFOSSIL_DYNAMIC_BUILD=1
756
+RCC += -DFOSSIL_DYNAMIC_BUILD=1
754757
755758
 #### MinGW: If available, use the Unicode capable runtime startup code.
756759
 #
757760
 ifndef MINGW_IS_32BIT_ONLY
758761
 LIB += -municode
759762
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,14 +745,17 @@
745 ifdef FOSSIL_ENABLE_JSON
746 TCC += -DFOSSIL_ENABLE_JSON=1
747 RCC += -DFOSSIL_ENABLE_JSON=1
748 endif
749
750 #### We add the -static option here so that we can build a static
751 # executable that will run in a chroot jail.
752 #
753 LIB = -static
 
 
 
754
755 #### MinGW: If available, use the Unicode capable runtime startup code.
756 #
757 ifndef MINGW_IS_32BIT_ONLY
758 LIB += -municode
759
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,14 +745,17 @@
745 ifdef FOSSIL_ENABLE_JSON
746 TCC += -DFOSSIL_ENABLE_JSON=1
747 RCC += -DFOSSIL_ENABLE_JSON=1
748 endif
749
750 #### The option -static has no effect on mingw(-w64), only
751 # dynamic executables can be built linking with msvcrt.dll.
752 # Openssl (optional) and zlib however are always linked in
753 # statically.
754 #LIB = -static
755 TCC += -DFOSSIL_DYNAMIC_BUILD=1
756 RCC += -DFOSSIL_DYNAMIC_BUILD=1
757
758 #### MinGW: If available, use the Unicode capable runtime startup code.
759 #
760 ifndef MINGW_IS_32BIT_ONLY
761 LIB += -municode
762
M win/Makefile.mingw
+7 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,14 +298,17 @@
298298
 ifdef FOSSIL_ENABLE_JSON
299299
 TCC += -DFOSSIL_ENABLE_JSON=1
300300
 RCC += -DFOSSIL_ENABLE_JSON=1
301301
 endif
302302
303
-#### We add the -static option here so that we can build a static
304
-# executable that will run in a chroot jail.
305
-#
306
-LIB = -static
303
+#### The option -static has no effect on mingw(-w64), only
304
+# dynamic executables can be built linking with msvcrt.dll.
305
+# Openssl (optional) and zlib however are always linked in
306
+# statically.
307
+#LIB = -static
308
+TCC += -DFOSSIL_DYNAMIC_BUILD=1
309
+RCC += -DFOSSIL_DYNAMIC_BUILD=1
307310
308311
 #### MinGW: If available, use the Unicode capable runtime startup code.
309312
 #
310313
 ifndef MINGW_IS_32BIT_ONLY
311314
 LIB += -municode
312315
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,14 +298,17 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### We add the -static option here so that we can build a static
304 # executable that will run in a chroot jail.
305 #
306 LIB = -static
 
 
 
307
308 #### MinGW: If available, use the Unicode capable runtime startup code.
309 #
310 ifndef MINGW_IS_32BIT_ONLY
311 LIB += -municode
312
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,14 +298,17 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on mingw(-w64), only
304 # dynamic executables can be built linking with msvcrt.dll.
305 # Openssl (optional) and zlib however are always linked in
306 # statically.
307 #LIB = -static
308 TCC += -DFOSSIL_DYNAMIC_BUILD=1
309 RCC += -DFOSSIL_DYNAMIC_BUILD=1
310
311 #### MinGW: If available, use the Unicode capable runtime startup code.
312 #
313 ifndef MINGW_IS_32BIT_ONLY
314 LIB += -municode
315
M win/Makefile.mingw.mistachkin
+7 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,14 +298,17 @@
298298
 ifdef FOSSIL_ENABLE_JSON
299299
 TCC += -DFOSSIL_ENABLE_JSON=1
300300
 RCC += -DFOSSIL_ENABLE_JSON=1
301301
 endif
302302
303
-#### We add the -static option here so that we can build a static
304
-# executable that will run in a chroot jail.
305
-#
306
-LIB = -static
303
+#### The option -static has no effect on mingw(-w64), only
304
+# dynamic executables can be built linking with msvcrt.dll.
305
+# Openssl (optional) and zlib however are always linked in
306
+# statically.
307
+#LIB = -static
308
+TCC += -DFOSSIL_DYNAMIC_BUILD=1
309
+RCC += -DFOSSIL_DYNAMIC_BUILD=1
307310
308311
 #### MinGW: If available, use the Unicode capable runtime startup code.
309312
 #
310313
 ifndef MINGW_IS_32BIT_ONLY
311314
 LIB += -municode
312315
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,14 +298,17 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### We add the -static option here so that we can build a static
304 # executable that will run in a chroot jail.
305 #
306 LIB = -static
 
 
 
307
308 #### MinGW: If available, use the Unicode capable runtime startup code.
309 #
310 ifndef MINGW_IS_32BIT_ONLY
311 LIB += -municode
312
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,14 +298,17 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on mingw(-w64), only
304 # dynamic executables can be built linking with msvcrt.dll.
305 # Openssl (optional) and zlib however are always linked in
306 # statically.
307 #LIB = -static
308 TCC += -DFOSSIL_DYNAMIC_BUILD=1
309 RCC += -DFOSSIL_DYNAMIC_BUILD=1
310
311 #### MinGW: If available, use the Unicode capable runtime startup code.
312 #
313 ifndef MINGW_IS_32BIT_ONLY
314 LIB += -municode
315

Keyboard Shortcuts

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