Fossil SCM

... and the makemake.tcl corresponding changes as well

jan.nijtmans 2012-08-23 14:29 UTC better-mingw-v2
Commit e55c7139b46a86fb2d0c1edbdf1c1cfd413a42c6
Parent 69608104d2e8bf7…
2 files changed +8 -6 +8 -6
~ src/makemake.tcl ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+8 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -466,18 +466,14 @@
466466
 ifdef FOSSIL_ENABLE_JSON
467467
 TCC += -DFOSSIL_ENABLE_JSON=1
468468
 RCC += -DFOSSIL_ENABLE_JSON=1
469469
 endif
470470
471
-#### Extra arguments for linking the finished binary. Fossil needs
472
-# to link against the Z-Lib compression library. There are no
473
-# other mandatory dependencies. We add the -static option here
474
-# so that we can build a static executable that will run in a
475
-# chroot jail.
471
+#### We add the -static option here so that we can build a static
472
+# executable that will run in a chroot jail.
476473
 #
477474
 LIB = -static
478
-LIB += -lmingwex -lz
479475
480476
 # OpenSSL: Add the necessary libraries required, if enabled.
481477
 ifdef FOSSIL_ENABLE_SSL
482478
 LIB += -lssl -lcrypto -lgdi32
483479
 endif
@@ -484,10 +480,16 @@
484480
485481
 # Tcl: Add the necessary libraries required, if enabled.
486482
 ifdef FOSSIL_ENABLE_TCL
487483
 LIB += $(LIBTCL)
488484
 endif
485
+
486
+#### Extra arguments for linking the finished binary. Fossil needs
487
+# to link against the Z-Lib compression library. There are no
488
+# other mandatory dependencies.
489
+#
490
+LIB += -lmingwex -lz
489491
490492
 #### These libraries MUST appear in the same order as they do for Tcl
491493
 # or linking with it will not work (exact reason unknown).
492494
 #
493495
 ifdef FOSSIL_ENABLE_TCL
494496
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -466,18 +466,14 @@
466 ifdef FOSSIL_ENABLE_JSON
467 TCC += -DFOSSIL_ENABLE_JSON=1
468 RCC += -DFOSSIL_ENABLE_JSON=1
469 endif
470
471 #### Extra arguments for linking the finished binary. Fossil needs
472 # to link against the Z-Lib compression library. There are no
473 # other mandatory dependencies. We add the -static option here
474 # so that we can build a static executable that will run in a
475 # chroot jail.
476 #
477 LIB = -static
478 LIB += -lmingwex -lz
479
480 # OpenSSL: Add the necessary libraries required, if enabled.
481 ifdef FOSSIL_ENABLE_SSL
482 LIB += -lssl -lcrypto -lgdi32
483 endif
@@ -484,10 +480,16 @@
484
485 # Tcl: Add the necessary libraries required, if enabled.
486 ifdef FOSSIL_ENABLE_TCL
487 LIB += $(LIBTCL)
488 endif
 
 
 
 
 
 
489
490 #### These libraries MUST appear in the same order as they do for Tcl
491 # or linking with it will not work (exact reason unknown).
492 #
493 ifdef FOSSIL_ENABLE_TCL
494
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -466,18 +466,14 @@
466 ifdef FOSSIL_ENABLE_JSON
467 TCC += -DFOSSIL_ENABLE_JSON=1
468 RCC += -DFOSSIL_ENABLE_JSON=1
469 endif
470
471 #### We add the -static option here so that we can build a static
472 # executable that will run in a chroot jail.
 
 
 
473 #
474 LIB = -static
 
475
476 # OpenSSL: Add the necessary libraries required, if enabled.
477 ifdef FOSSIL_ENABLE_SSL
478 LIB += -lssl -lcrypto -lgdi32
479 endif
@@ -484,10 +480,16 @@
480
481 # Tcl: Add the necessary libraries required, if enabled.
482 ifdef FOSSIL_ENABLE_TCL
483 LIB += $(LIBTCL)
484 endif
485
486 #### Extra arguments for linking the finished binary. Fossil needs
487 # to link against the Z-Lib compression library. There are no
488 # other mandatory dependencies.
489 #
490 LIB += -lmingwex -lz
491
492 #### These libraries MUST appear in the same order as they do for Tcl
493 # or linking with it will not work (exact reason unknown).
494 #
495 ifdef FOSSIL_ENABLE_TCL
496
M win/Makefile.mingw.mistachkin
+8 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -145,18 +145,14 @@
145145
 ifdef FOSSIL_ENABLE_JSON
146146
 TCC += -DFOSSIL_ENABLE_JSON=1
147147
 RCC += -DFOSSIL_ENABLE_JSON=1
148148
 endif
149149
150
-#### Extra arguments for linking the finished binary. Fossil needs
151
-# to link against the Z-Lib compression library. There are no
152
-# other mandatory dependencies. We add the -static option here
153
-# so that we can build a static executable that will run in a
154
-# chroot jail.
150
+#### We add the -static option here so that we can build a static
151
+# executable that will run in a chroot jail.
155152
 #
156153
 LIB = -static
157
-LIB += -lmingwex -lz
158154
159155
 # OpenSSL: Add the necessary libraries required, if enabled.
160156
 ifdef FOSSIL_ENABLE_SSL
161157
 LIB += -lssl -lcrypto -lgdi32
162158
 endif
@@ -163,10 +159,16 @@
163159
164160
 # Tcl: Add the necessary libraries required, if enabled.
165161
 ifdef FOSSIL_ENABLE_TCL
166162
 LIB += $(LIBTCL)
167163
 endif
164
+
165
+#### Extra arguments for linking the finished binary. Fossil needs
166
+# to link against the Z-Lib compression library. There are no
167
+# other mandatory dependencies.
168
+#
169
+LIB += -lmingwex -lz
168170
169171
 #### These libraries MUST appear in the same order as they do for Tcl
170172
 # or linking with it will not work (exact reason unknown).
171173
 #
172174
 ifdef FOSSIL_ENABLE_TCL
173175
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -145,18 +145,14 @@
145 ifdef FOSSIL_ENABLE_JSON
146 TCC += -DFOSSIL_ENABLE_JSON=1
147 RCC += -DFOSSIL_ENABLE_JSON=1
148 endif
149
150 #### Extra arguments for linking the finished binary. Fossil needs
151 # to link against the Z-Lib compression library. There are no
152 # other mandatory dependencies. We add the -static option here
153 # so that we can build a static executable that will run in a
154 # chroot jail.
155 #
156 LIB = -static
157 LIB += -lmingwex -lz
158
159 # OpenSSL: Add the necessary libraries required, if enabled.
160 ifdef FOSSIL_ENABLE_SSL
161 LIB += -lssl -lcrypto -lgdi32
162 endif
@@ -163,10 +159,16 @@
163
164 # Tcl: Add the necessary libraries required, if enabled.
165 ifdef FOSSIL_ENABLE_TCL
166 LIB += $(LIBTCL)
167 endif
 
 
 
 
 
 
168
169 #### These libraries MUST appear in the same order as they do for Tcl
170 # or linking with it will not work (exact reason unknown).
171 #
172 ifdef FOSSIL_ENABLE_TCL
173
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -145,18 +145,14 @@
145 ifdef FOSSIL_ENABLE_JSON
146 TCC += -DFOSSIL_ENABLE_JSON=1
147 RCC += -DFOSSIL_ENABLE_JSON=1
148 endif
149
150 #### We add the -static option here so that we can build a static
151 # executable that will run in a chroot jail.
 
 
 
152 #
153 LIB = -static
 
154
155 # OpenSSL: Add the necessary libraries required, if enabled.
156 ifdef FOSSIL_ENABLE_SSL
157 LIB += -lssl -lcrypto -lgdi32
158 endif
@@ -163,10 +159,16 @@
159
160 # Tcl: Add the necessary libraries required, if enabled.
161 ifdef FOSSIL_ENABLE_TCL
162 LIB += $(LIBTCL)
163 endif
164
165 #### Extra arguments for linking the finished binary. Fossil needs
166 # to link against the Z-Lib compression library. There are no
167 # other mandatory dependencies.
168 #
169 LIB += -lmingwex -lz
170
171 #### These libraries MUST appear in the same order as they do for Tcl
172 # or linking with it will not work (exact reason unknown).
173 #
174 ifdef FOSSIL_ENABLE_TCL
175

Keyboard Shortcuts

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