Fix doc snarfing with GCC 4.5+. From <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=aac41d28358cea594bb30f6e547afb82bb6004a6>. diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi index ea33e17..8cd42e8 100755 --- a/scripts/snarf-check-and-output-texi +++ b/scripts/snarf-check-and-output-texi @@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" (set! *file* file) (set! *line* line)) + ;; newer gccs like to throw around more location markers into the + ;; preprocessed source; these (hash . hash) bits are what they translate to + ;; in snarfy terms. + (('location ('string . file) ('int . line) ('hash . 'hash)) + (set! *file* file) + (set! *line* line)) + + (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash)) + (set! *file* file) + (set! *line* line)) + (('arglist rest ...) (set! *args* (do-arglist rest))) able> <table class='tabs'><tr><td> <a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>refs</a><a class='active' href='/guix/log/gnu/packages/simulation.scm'>log</a><a href='/guix/tree/gnu/packages/simulation.scm?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>tree</a><a href='/guix/commit/gnu/packages/simulation.scm?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>commit</a><a href='/guix/diff/gnu/packages/simulation.scm?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/simulation.scm'> <input type='hidden' name='id' value='3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/guix/log/?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>root</a>/<a href='/guix/log/gnu?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>gnu</a>/<a href='/guix/log/gnu/packages?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>packages</a>/<a href='/guix/log/gnu/packages/simulation.scm?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d'>simulation.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/simulation.scm?id=3f3c986001dcfd21c50c9e2c2118316bc7ab9f8d&showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr> <tr><td><span title='2023-08-29 22:07:48 +0200'>2023-08-29</span></td><td><a href='/guix/commit/gnu/packages/simulation.scm?id=46f36ac9696b5ac0ac874ebc8bb053b499d883ac'>gnu: python-dolfin-adjoint: Fix build.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/simulation.scm (python-dolfin-adjoint): Fix build. [arguments]: Disable failing test_read_checkpoint in 'check phase. Remove broken 'sanity-check phase. Signed-off-by: Andreas Enge <andreas@enge.fr> </span></span></td><td>Felix Gruber</td></tr> <tr><td><span title='2023-08-11 00:50:47 +0200'>2023-08-11</span></td><td><a href='/guix/commit/gnu/packages/simulation.scm?id=caa30ff2f13a149810e564ab9b1737e057345032'>gnu: openfoam-org: Use 'git-fetch'.</a><span class='msg-avail'>...<span class='msg-tooltip'>So far the source was taken from an auto-generated, unstable tarball at github.com. This fixes that. * gnu/packages/simulation.scm (openfoam-org)[source]: Switch to 'git-fetch'. [arguments]: Add 'rename-self' phase. </span></span></td><td>Ludovic Courtès</td></tr> <tr><td><span title='2023-08-10 09:26:08 +0200'>2023-08-10</span></td><td><a href='/guix/commit/gnu/packages/simulation.scm?id=997b38badaee20a1c60411e5e599e260e47785ec'>gnu: Add openfoam-com.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/simulation.scm (openfoam-com): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> </span></span></td><td>reza</td></tr> <tr><td><span title='2023-08-10 09:26:08 +0200'>2023-08-10</span></td><td><a href='/guix/commit/gnu/packages/simulation.scm?id=5d77091cfc80b1f4b622ada760f54a3bae844e74'>gnu: Add openfoam-org. Deprecate openfoam.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/openfoam-4.1-cleanup.patch: Delete file. * gnu/local.mk: Remove it. * gnu/packages/simulation.scm (openfoam-org): New variable. (openfoam): Mark as deprecated. Signed-off-by: Ludovic Courtès <ludo@gnu.org> </span></span></td><td>reza</td></tr>