From 2c5b0d5d6eba3bda4e83f489da546060fa8f3a2b Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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 #include #include -#include "third_party/robin-map/include/tsl/robin_map.h" +#include #import "lock.h" #import "objc/runtime.h" #import "objc/blocks_runtime.h" -- 2.34.0 mmit/gnu/packages/patches/ruby-latex-decode-fix-test.patch?id=e45f9b4b1251df1a51a30e1d4a53fc2075abfcfe'>commitdiff
/a>...The guixsd.org domain is no longer advertised since before in 1.0.0 release in May 2019. * etc/substitutes/berlin.guixsd.org.pub: Rename to... * etc/substitutes/berlin.guix.gnu.org.pub: ... this. * etc/substitutes/ci.guix.gnu.org.pub, etc/substitutes/ci.guix.info.pub: Adjust accordingly. * gnu/services/base.scm (%default-authorized-guix-keys): Likewise. * guix/build/download-nar.scm (urls-for-item): Likewise. * guix/self.scm (miscellaneous-files): Likewise. * Makefile.am (dist_pkgdata_DATA): Likewise.
AgeCommit message (Expand)Author
Ludovic Courtès