Fossil SCM
Work around an apparent bug in the @AUTODEP@ feature of autosetup. [forum:/forumpost/c4e28a9995|Forum thread c4e28a9995].
Commit
da7092cc9312d72fa606802ab481caf6a641c23edbd2c243c00444cc3c0c608f
Parent
91d70b7cc7070f5…
1 file changed
+15
-2
+15
-2
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -121,13 +121,26 @@ | ||
| 121 | 121 | # but Makefile won't change, so we'll reconfig but... endlessly. |
| 122 | 122 | # |
| 123 | 123 | # This is also why we repeat the reconfig target's command here instead |
| 124 | 124 | # of delegating to it with "$(MAKE) reconfig": having children running |
| 125 | 125 | # around interfering makes this failure mode even worse. |
| 126 | -Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@ | |
| 126 | +# | |
| 127 | +# 2025-01-27: The @AUTODEP@ macro in autosetup is broken for source trees | |
| 128 | +# that contain space charater in their path. So don't use it. The | |
| 129 | +# FOSSIL_AUTODEP macro is manual coded to be the autosetup dependencies. | |
| 130 | +# FOSSIL_AUTODEP might need to be adjusted if autosetup changes. | |
| 131 | +# | |
| 132 | +FOSSIL_AUTODEP = \ | |
| 133 | + $(TOPDIR)/auto.def \ | |
| 134 | + $(TOPDIR)/autosetup/autosetup \ | |
| 135 | + $(TOPDIR)/autosetup/local.tcl \ | |
| 136 | + $(TOPDIR)/autosetup/system.tcl \ | |
| 137 | + $(TOPDIR)/autosetup/cc.tcl \ | |
| 138 | + $(TOPDIR)/autosetup/cc-lib.tcl | |
| 139 | +Makefile: $(TOPDIR)/Makefile.in $(SRCDIR)/main.mk $(FOSSIL_AUTODEP) | |
| 127 | 140 | @AUTOREMAKE@ |
| 128 | - touch @builddir@/Makefile | |
| 141 | + touch Makefile | |
| 129 | 142 | |
| 130 | 143 | # Container stuff |
| 131 | 144 | SRCTB := src-@[email protected] |
| 132 | 145 | IMGVER := fossil:@FOSSIL_CI_PFX@ |
| 133 | 146 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 134 | 147 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -121,13 +121,26 @@ | |
| 121 | # but Makefile won't change, so we'll reconfig but... endlessly. |
| 122 | # |
| 123 | # This is also why we repeat the reconfig target's command here instead |
| 124 | # of delegating to it with "$(MAKE) reconfig": having children running |
| 125 | # around interfering makes this failure mode even worse. |
| 126 | Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@ |
| 127 | @AUTOREMAKE@ |
| 128 | touch @builddir@/Makefile |
| 129 | |
| 130 | # Container stuff |
| 131 | SRCTB := src-@[email protected] |
| 132 | IMGVER := fossil:@FOSSIL_CI_PFX@ |
| 133 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 134 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -121,13 +121,26 @@ | |
| 121 | # but Makefile won't change, so we'll reconfig but... endlessly. |
| 122 | # |
| 123 | # This is also why we repeat the reconfig target's command here instead |
| 124 | # of delegating to it with "$(MAKE) reconfig": having children running |
| 125 | # around interfering makes this failure mode even worse. |
| 126 | # |
| 127 | # 2025-01-27: The @AUTODEP@ macro in autosetup is broken for source trees |
| 128 | # that contain space charater in their path. So don't use it. The |
| 129 | # FOSSIL_AUTODEP macro is manual coded to be the autosetup dependencies. |
| 130 | # FOSSIL_AUTODEP might need to be adjusted if autosetup changes. |
| 131 | # |
| 132 | FOSSIL_AUTODEP = \ |
| 133 | $(TOPDIR)/auto.def \ |
| 134 | $(TOPDIR)/autosetup/autosetup \ |
| 135 | $(TOPDIR)/autosetup/local.tcl \ |
| 136 | $(TOPDIR)/autosetup/system.tcl \ |
| 137 | $(TOPDIR)/autosetup/cc.tcl \ |
| 138 | $(TOPDIR)/autosetup/cc-lib.tcl |
| 139 | Makefile: $(TOPDIR)/Makefile.in $(SRCDIR)/main.mk $(FOSSIL_AUTODEP) |
| 140 | @AUTOREMAKE@ |
| 141 | touch Makefile |
| 142 | |
| 143 | # Container stuff |
| 144 | SRCTB := src-@[email protected] |
| 145 | IMGVER := fossil:@FOSSIL_CI_PFX@ |
| 146 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 147 |