From a4c4e4f3c410834c3e56f644841f5bcbb084225c Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
Date: Fri, 28 Jun 2024 11:15:16 +0200
Subject: [PATCH] clasp: Hide Event_t<T>::id_s.

This patch helps build clingo with non-local clasp while keeping the
event system working as intended.
---
 clasp/util/misc_types.h | 2 ++
 src/CMakeLists.txt      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clasp/util/misc_types.h b/clasp/util/misc_types.h
index 3677873..09c2075 100644
--- a/clasp/util/misc_types.h
+++ b/clasp/util/misc_types.h
@@ -432,7 +432,9 @@ struct Event_t : Event {
 	Event_t(Subsystem sys, Verbosity verb) : Event(sys, id_s, verb) {}
 	static const uint32 id_s;
 };
+#if _BUILDING_CLASP_
 template <class T> const uint32 Event_t<T>::id_s = Event::nextId();
+#endif
 
 template <class ToType, class EvType> const ToType* event_cast(const EvType& ev) { return ev.id == ToType::id_s ? static_cast<const ToType*>(&ev) : 0; }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8439d12..4f55990 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,6 +123,7 @@ source_group("${ide_header}\\mt" FILES ${header_mt})
 endif()
 
 add_library(libclasp ${header} ${header_util} ${header_cli} ${header_mt} ${src})
+target_compile_definitions(libclasp PRIVATE _BUILDING_CLASP_)
 if (CLASP_BUILD_WITH_THREADS)
 	target_link_libraries(libclasp PUBLIC Threads::Threads)
 	target_compile_options(libclasp PRIVATE
-- 
2.45.1

cf5b3856d8c5e1566'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/final.scm'>
<input type='hidden' name='id' value='4624302c4a626873e83f163cf5b3856d8c5e1566'/><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=4624302c4a626873e83f163cf5b3856d8c5e1566'>root</a>/<a href='/guix/log/gnu?id=4624302c4a626873e83f163cf5b3856d8c5e1566'>gnu</a>/<a href='/guix/log/gnu/installer?id=4624302c4a626873e83f163cf5b3856d8c5e1566'>installer</a>/<a href='/guix/log/gnu/installer/final.scm?id=4624302c4a626873e83f163cf5b3856d8c5e1566'>final.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/installer/final.scm?id=4624302c4a626873e83f163cf5b3856d8c5e1566&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-18 01:17:17 +0100'>2022-12-18</span></td><td><a href='/guix/commit/gnu/installer/final.scm?id=495c50008be91429ebea3805e161a1e385a2a572'>installer: final: Delete SQLite WAL and shm files upon completion.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, db.sqlite-{wal,shm} could be left behind after stopping
guix-daemon.  When resuming installation, SQLite could end up behaving
as if transactions visible in the WAL file had been committed, in spite
of having restored SAVED-DATABASE.

Fixes &lt;https://issues.guix.gnu.org/59784&gt;.
Reported by pelzflorian (Florian Pelz) &lt;pelzflorian@pelzflorian.de&gt;.

* gnu/installer/final.scm (install-system): Before restarting
guix-daemon, delete db.sqlite-{wal,shm}.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-18 01:17:17 +0100'>2022-12-18</span></td><td><a href='/guix/commit/gnu/installer/final.scm?id=9b6703eabee07068328a5e489deb3d532f242daa'>installer: final: Stop guix-daemon before accessing store database.</a><span class='msg-avail'>...<span class='msg-tooltip'>As part of fixing &lt;https://issues.guix.gnu.org/59784&gt;, make sure
/var/guix/db.sqlite is only copied while guix-daemon is stopped.

* gnu/installer/final.scm (call-with-mnt-container): Add FIXME comment.
(install-system): Copy DATABASE-FILE and SAVED-DATABASE only when
'guix-daemon' is stopped.  Add logging lines.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-10-20 10:50:50 +0200'>2022-10-20</span></td><td><a href='/guix/commit/gnu/installer/final.scm?id=96bb00d20336f43fac2c42662e4b1d300e624738'>installer: Run the "guix system init" command in a PTY.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/55360&gt;

* gnu/installer/utils.scm (run-external-command-with-handler/tty): New
procedure.
(run-external-command-with-line-hooks, run-command): Add a TTY? argument.
* gnu/installer/final.scm (install-system): Call run-command with TTY?
argument set to #true.
</span></span></td><td>Mathieu Othacehe</td></tr>