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 s/docbook.scm?id=0c0fdae4ab6480fcb34bc907a2e2a419d3c4a3ff'>diff
path: root/gnu/packages/docbook.scm
AgeCommit message (Expand)Author
2022-03-02gnu: texlive-latex-listings: Rename to "texlive-listings"....Suggested by Ricardo Wurmus. * gnu/packages/tex.scm (texlive-latex-listings): Rename to... (texlive-listings): ... this. Adjust 'name' accordingly. (texlive-latex-listings): Define as deprecated. (texlive-latex-xkeyval)[propagated-inputs]: Add comment. * gnu/packages/docbook.scm (dblatex)[inputs]: Add comment. Ludovic Courtès
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès
2021-11-11gnu: Add docbook-xsl-ns....* gnu/packages/docbook.scm (docbook-xsl-ns): New variable. Maxim Cournoyer
2021-10-31Merge remote-tracking branch 'origin/master' into core-updates-frozenEfraim Flashner
2021-10-19gnu: dblatex: Update to 0.3.12....* gnu/packages/docbook.scm (dblatex): Update to 0.3.12. [arguments]: Don't explicitly return #t from phases. Tobias Geerinckx-Rice
2021-09-17Merge branch 'master' into core-updates-frozen... Conflicts: gnu/packages/bioinformatics.scm gnu/packages/chez.scm gnu/packages/docbook.scm gnu/packages/ebook.scm gnu/packages/gnome.scm gnu/packages/linux.scm gnu/packages/networking.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/tex.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/dune.scm guix/build-system/go.scm guix/build-system/linux-module.scm guix/packages.scm Marius Bakke
2021-09-14gnu: dblatex: Update package names in texlive-union....* gnu/packages/docbook.scm (dblatex)[inputs]: Replace texlive-latex-hyperref with texlive-hyperref, texlive-latex-wasysym with texlive-wasysym, texlive-fonts-stmryrd with texlive-stmryrd. Efraim Flashner
2021-09-13gnu: Add docbook2x....* gnu/packages/docbook.scm (docbook2x): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Andrew Whatson
2021-09-13gnu: Prefix licenses in docbook module....This prevents conflicts between expat package and expat license. * gnu/packages/docbook.scm (docbook-xml-5): Prefix license variable. (docbook-xsl): Likewise. (docbook-dsssl): Likewise. (docbook-dsssl-doc): Likewise. (docbook-sgml): Likewise. (iso-8879-entities): Likewise. (dblatex): Likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Andrew Whatson