From 2c5b0d5d6eba3bda4e83f489da546060fa8f3a2b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 26 Mar 2022 16:54:43 +0800
Subject: [PATCH] Unbundle robin-map.

This patch makes libobjc2 use robin-map header from system instead of cloning
from submodule.
---
 CMakeLists.txt | 8 --------
 arc.mm         | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2746e9..cf731f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,14 +86,6 @@ else ()
 	list(APPEND libobjc_C_SRCS eh_personality.c)
 endif (WIN32)
 
-if (NOT EXISTS "${CMAKE_SOURCE_DIR}/third_party/robin-map/include/tsl/robin_map.h")
-	message(FATAL_ERROR "Git submodules not present, please run:\n\n"
-						" $ git submodule init && git submodule update\n\n"
-						"If you did not checkout via git, you will need to"
-						"fetch the submodule's contents from"
-						"https://github.com/Tessil/robin-map/")
-endif ()
-
 # For release builds, we disable spamming the terminal with warnings about
 # selector type mismatches
 if (CMAKE_BUILD_TYPE STREQUAL Release)
diff --git a/arc.mm b/arc.mm
index c96681f..cc93e7f 100644
--- a/arc.mm
+++ b/arc.mm
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "third_party/robin-map/include/tsl/robin_map.h"
+#include <tsl/robin_map.h>
 #import "lock.h"
 #import "objc/runtime.h"
 #import "objc/blocks_runtime.h"
-- 
2.34.0

e63cdf9779b86fac518fc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/base.scm'>
<input type='hidden' name='id' value='3d15f6a891593b912ebe63cdf9779b86fac518fc'/><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=3d15f6a891593b912ebe63cdf9779b86fac518fc'>root</a>/<a href='/guix/log/gnu?id=3d15f6a891593b912ebe63cdf9779b86fac518fc'>gnu</a>/<a href='/guix/log/gnu/tests?id=3d15f6a891593b912ebe63cdf9779b86fac518fc'>tests</a>/<a href='/guix/log/gnu/tests/base.scm?id=3d15f6a891593b912ebe63cdf9779b86fac518fc'>base.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/tests/base.scm?id=3d15f6a891593b912ebe63cdf9779b86fac518fc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-10-24 14:50:09 +0200'>2024-10-24</span></td><td><a href='/guix/commit/gnu/tests/base.scm?id=cc67a0b71d4a7d98a3732c3edf2eb340c2799697'>gnu: system: Privilege programs after creating accounts.</a><span class='msg-avail'>...<span class='msg-tooltip'>Ensure that users and groups are already created when the privileging script
runs. The order these scripts appear in the folded activation-service depends
on the order these services are instantiated in the operating-system.

Fixes &lt;https://issues.guix.gnu.org/73680&gt;.

* gnu/system.scm (operating-system-default-essential-services): Move
privileged-program-service above account-service.
(hurd-default-essential-services): Likewise.
* gnu/tests/base.scm (%activation-os): New variable.
(run-activation-test): New procedure.
(%test-activation): New variable.

Change-Id: I59a191c5519475f256e81bdf2dc4cb01b96c31fe
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Dariqq</td></tr>
<tr><td><span title='2024-09-25 17:53:53 +0200'>2024-09-25</span></td><td><a href='/guix/commit/gnu/tests/base.scm?id=f92151133da4b98f98e755ce0996e8be59acac72'>services: cleanup: Reintroduce explicit ‘chmod’ calls.</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit e74d05db53fdf02956ccee0950896c6ca9f10573.

* gnu/services.scm (cleanup-gexp): Introduce explicit ‘chmod’ calls
after ‘mkdir’ calls.
* gnu/tests/base.scm (run-basic-test)[test]("permissions on /tmp"):
New test.

Reported-by: Hilton Chain &lt;hako@ultrarare.space&gt;
Change-Id: I1e14dbe52eac526d2ed4ec1dd9c6fd9036f96a63
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-07-18 17:31:18 +0200'>2024-07-18</span></td><td><a href='/guix/commit/gnu/tests/base.scm?id=a9d8ad6595b5501e3b257266370591759b5bd82e'>tests: base: Compare all the service provisions, not just canonical names.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/base.scm (run-basic-test)["shepherd services"]: Use
‘append-map’ on live service provisions to match what
‘operating-system-shepherd-service-names’ does.

Change-Id: Ie54082eed6c7b8d37d3428711e71c11e80940235
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-01-22 13:24:20 -0500'>2024-01-22</span></td><td><a href='/guix/commit/gnu/tests/base.scm?id=10a193596368443f441077525ebbddf787d91e4b'>gnu: Remove linux-libre 4.14.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/linux.scm (linux-libre-4.14-version,
linux-libre-4.14-gnu-revision, deblob-scripts-4.14,
linux-libre-4.14-pristine-source, linux-libre-4.14-source,
linux-libre-headers-4.14, linux-libre-4.14, linux-libre-arm-generic-4.14,
linux-libre-arm-omap2plus-4.14): Remove variables.
* gnu/packages/aux-files/linux-libre/4.14-arm.conf,
gnu/packages/aux-files/linux-libre/4.14-i686.conf,
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: Delete files.
* Makefile.am (AUX_FILES): Remove aforementioned .conf files.
* gnu/tests/base.scm (%test-linux-libre-4.14): Remove variable.

Change-Id: I40393b5f46b989848d569c929f1d9c986736553e
</span></span></td><td>Wilko Meyer</td></tr>