Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 452dfa9..e30c3cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -206,13 +206,15 @@ endif() add_definitions(-DSTBI_FAILURE_USERMSG) ## mpc - Micro Parser Combinators ## -execute_process( - COMMAND git submodule update --init src/mpc - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -) - -add_library(mpc STATIC "mpc/mpc.c") - +pkg_check_modules(MPC QUIET mpc) +if(NOT MPC_FOUND) + execute_process( + COMMAND git submodule update --init src/mpc + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + ) + add_library(mpc STATIC "mpc/mpc.c") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc) +endif() ## OpenBoardView ## add_subdirectory(openboardview) diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h index 1ccf8df..c57f7ff 100644 --- a/src/openboardview/FileFormats/GenCADFile.h +++ b/src/openboardview/FileFormats/GenCADFile.h @@ -5,7 +5,7 @@ #include "build-generated/GenCADFileGrammar.h" -#include "mpc/mpc.h" +#include "mpc.h" #include #include 4151e41139c00f2e10d7569c4ff078a98b7a81'>treecommitdiff
path: root/nix
AgeCommit message (Expand)Author
2023-12-10daemon: Sacrifice builders on OOM....* nix/libstore/build.cc (DerivationGoal::runChild): Maximise our OOM score adjustment. Change-Id: I418c763b499ca16e1ffe3c6033319112b9744f51 Tobias Geerinckx-Rice
2023-12-11daemon: Implement ‘substitute-urls’ RPC....* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump. (WorkerOp): Add ‘wopSubstituteURLs’. * nix/nix-daemon/nix-daemon.cc (performOp): Implement it. * guix/store.scm (%protocol-version): Bump. (operation-id): Add ‘substitute-urls’. (substitute-urls): New procedure. * tests/store.scm ("substitute-urls, default") ("substitute-urls, client-specified URLs") ("substitute-urls, disabled"): New tests. Change-Id: I2c0119500c3a1eecfa5ebf32463ffb0f173161de Ludovic Courtès
2023-12-04daemon: Simplify “empty status” substitute error message....* nix/libstore/build.cc (SubstitutionGoal::finished): Don’t show what the empty status looks like. Change-Id: Ie898432aeb047aff3d59024de6ed6d18f68903c4 Ludovic Courtès
2023-09-24Revert "build: Add missing guix-gc.timer file to binary tarball."...This reverts commit 69f6edc1a8596d2cb4c67e0435d35633af6f3cbc. The intention is good, but nodist_systemdservice_DATA are meant to be disposable artefacts generated from corresponding ‘.in’ files. etc/guix-gc.timer doesn't fit that description, breaking builds: $ make clean && make … make[2]: *** No rule to make target 'etc/guix-gc.timer', needed by 'all-am'. Stop. Tobias Geerinckx-Rice
2023-09-26daemon: Add “git-download” built-in builder....The new builder makes it possible to break cycles that occurs when the fixed-output derivation for the source of a dependency of ‘git’ would itself depend on ‘git’. * guix/scripts/perform-download.scm (perform-git-download): New procedure. (perform-download): Move fixed-output derivation check to… (guix-perform-download): … here. Invoke ‘perform-download’ or ‘perform-git-download’ depending on what ‘derivation-builder’ returns. * nix/libstore/builtins.cc (builtins): Add “git-download”. * tests/derivations.scm ("built-in-builders"): Update. ("'git-download' built-in builder") ("'git-download' built-in builder, invalid hash") ("'git-download' built-in builder, invalid commit") ("'git-download' built-in builder, not found"): New tests. Ludovic Courtès
2023-09-09daemon: Fix build with GCC 13....The sqlite.hh file uses fixed-width integer types from stdint.h. As such, it needs to include <cstdint>. Without this include, the file doesn't compile successfully with GCC13. See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes * nix/libstore/sqlite.hh: include <cstdint> Signed-off-by: Sören Tempel <soeren@soeren-tempel.net> Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sören Tempel
2023-08-31build: Add missing guix-gc.timer file to binary tarball....Partially fixes <https://issues.guix.gnu.org/65117>. * nix/local.mk (nodist_systemdservice_DATA): Add etc/guix-gc.timer. Maxim Cournoyer