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 kages/nfs.scm'>logtreecommitdiff
path: root/gnu/packages/nfs.scm
AgeCommit message (Expand)Author
2020-12-10gnu: nfs-utils: Fix location of external util-linux binaries....Fixes: ~ λ sudo mount -t nfs 1.2.3.4:/ /mnt /gnu/store/aaa-nfs-utils-2.4.3/sbin/start-statd: line 10: /gnu/store/bbb-util-linux-2.35.1-lib/bin/flock: No such file or directory mount.nfs: rpc.statd is not running but is required for remote locking. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Point the util-linux label at util-linux:out and add util-linux:lib as a separate input. Tobias Geerinckx-Rice
2020-09-24gnu: nfs-utils: Do not generate static libraries....* gnu/packages/nfs.scm (nfs)[configure-flags]: Add "--disable-static". Maxim Cournoyer
2020-07-30gnu: Add nfs4-acl-tools....* gnu/packages/nfs.scm (nfs4-acl-tools): New variable. * gnu/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch: New file. * gnu/local.mk: Add it. Signed-off-by: Marius Bakke <marius@gnu.org> Lars-Dominik Braun
2020-05-26gnu: nfs-utils: Update to 2.4.3....* gnu/packages/nfs.scm (nfs-utils): Update to 2.4.3. Tobias Geerinckx-Rice
2020-04-08Merge branch 'master' into core-updates... Conflicts: etc/news.scm gnu/local.mk gnu/packages/check.scm gnu/packages/cross-base.scm gnu/packages/gimp.scm gnu/packages/java.scm gnu/packages/mail.scm gnu/packages/sdl.scm gnu/packages/texinfo.scm gnu/packages/tls.scm gnu/packages/version-control.scm Marius Bakke
2020-04-04gnu: nfs-utils: Fix the shebangs of the Python based tools....While attempting to debug NFS with 'mountstats' and other Python based tools, I was greeted by the error: bash: /run/current-system/profile/sbin/mountstats: /usr/bin/python: bad interpreter: No such file or directory Add python-wrapper, so that the Python shebangs get rewritten correctly. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Add python-wrapper. Maxim Cournoyer