git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 4/5] Makefile: respect build info declared in "config.mak"

From
Jeff King <peff@peff.net>
Date
Dec 28, 2024, 19:43 UTC
Message-ID
<20241228194345.GA1535629@coredump.intra.peff.net>
In-Reply-To
<Z2XAiDC4pJ9OjTpC@pks.im>
On Fri, Dec 20, 2024 at 08:07:52PM +0100, Patrick Steinhardt wrote:
Show 20 quoted lines
> > > +# Never include it on the first read-through, only after make has tried to
> > > +# refresh includes. We do not want the old values to pollute our new run of the
> > > +# rule above.
> > > +ifdef MAKE_RESTARTS
> > >  -include GIT-VERSION-FILE
> > > +endif
> [...]
> Okay, I did find an issue where it does not work:
> 
>     $ git clean -dfx
>     $ make GIT-USER-AGENT
>     $ cat GIT-USER-AGENT
>     git/
>     $ cat GIT-VERSION-FILE
>     cat: GIT-VERSION-FILE: No such file or directory
> 
> It does not generate the version file at all anymore when it's not an
> explicit dependency. While I could of course add the missing dependency
> I don't know whether there are any other implicit dependencies that
> would be broken, as well. My gut feeling says "probably".

Doh, of course. We really want to say "do include this and consider it a dependency, but don't read it yet". But I don't think there's a way to tell make to do that.

I looked over your alternative approach with the OVERRIDE variable. I can't think of any downsides, aside from the general head-spinning complexity. ;) So that seems like a good approach for now (and I see it's already in master. Yay).

-Peff
Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 33 of 44 in “GIT-VERSION-GEN: fix overriding values”
  1. 0/2 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 19, 2024
  2. 2/2 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 19, 2024
  3. Kyle LippincottDec 19, 2024
  4. Junio C HamanoDec 19, 2024
  5. Jeff KingDec 20, 2024
  6. Junio C HamanoDec 20, 2024
  7. 1/2 GIT-VERSION-GEN: fix overriding version via environmentPatrick Steinhardt, Dec 19, 2024
  8. Junio C HamanoDec 19, 2024
  9. Jeff KingDec 20, 2024
  10. Patrick SteinhardtDec 20, 2024
  11. Jeff KingDec 20, 2024
  12. Patrick SteinhardtDec 20, 2024
  13. Jeff KingDec 20, 2024
  14. Patrick SteinhardtDec 20, 2024
  15. 0/5 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 20, 2024
  16. 1/5 GIT-VERSION-GEN: fix overriding version via environmentPatrick Steinhardt, Dec 20, 2024
  17. Jeff KingDec 20, 2024
  18. Junio C HamanoDec 20, 2024
  19. Patrick SteinhardtDec 20, 2024
  20. Patrick SteinhardtDec 20, 2024
  21. 2/5 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 20, 2024
  22. 3/5 Makefile: drop unneeded indirection for GIT-VERSION-GEN outputsPatrick Steinhardt, Dec 20, 2024
  23. Jeff KingDec 20, 2024
  24. 4/5 Makefile: respect build info declared in "config.mak"Patrick Steinhardt, Dec 20, 2024
  25. Jeff KingDec 20, 2024
  26. Patrick SteinhardtDec 20, 2024
  27. Jeff KingDec 20, 2024
  28. Patrick SteinhardtDec 20, 2024
  29. Patrick SteinhardtDec 20, 2024
  30. Jeff KingDec 20, 2024
  31. Patrick SteinhardtDec 20, 2024
  32. Patrick SteinhardtDec 20, 2024
  33. Jeff KingDec 28, 2024
  34. 5/5 meson: add options to override build informationPatrick Steinhardt, Dec 20, 2024
  35. Jeff KingDec 20, 2024
  36. 0/6 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 20, 2024
  37. 1/6 Makefile: stop including "GIT-VERSION-FILE" in docsPatrick Steinhardt, Dec 20, 2024
  38. 2/6 Makefile: drop unneeded indirection for GIT-VERSION-GEN outputsPatrick Steinhardt, Dec 20, 2024
  39. 3/6 Makefile: introduce template for GIT-VERSION-GENPatrick Steinhardt, Dec 20, 2024
  40. 4/6 GIT-VERSION-GEN: fix overriding GIT_VERSIONPatrick Steinhardt, Dec 20, 2024
  41. Junio C HamanoDec 20, 2024
  42. Patrick SteinhardtDec 21, 2024
  43. 6/6 meson: add options to override build informationPatrick Steinhardt, Dec 20, 2024
  44. 5/6 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 20, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.