From https://bitbucket.org/fenics-project/dolfin/issues/1120 From f627a442350560e50dbbb11f7828b6d807369533 Mon Sep 17 00:00:00 2001 From: Alexei Colin Date: Sun, 11 Apr 2021 20:40:00 -0400 Subject: [PATCH] cmake: PETSc,SLEPc: match lowercase .pc pkg-config files Upstream has moved to lowercase. PETSc has kept the mixed-case file for compatibility, but SLEPc hasn't. pkg_search_module takes multiple patterns and succeeds on first match, so this commit is backward-compatible with older installations of PETSc, SLEPc. --- cmake/modules/FindPETSc.cmake | 2 +- cmake/modules/FindSLEPc.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindPETSc.cmake b/cmake/modules/FindPETSc.cmake index 80faffdad..728a6ec30 100644 --- a/cmake/modules/FindPETSc.cmake +++ b/cmake/modules/FindPETSc.cmake @@ -51,7 +51,7 @@ find_package(PkgConfig REQUIRED) # Find PETSc pkg-config file. Note: craypetsc_real is on Cray systems set(ENV{PKG_CONFIG_PATH} "$ENV{CRAY_PETSC_PREFIX_DIR}/lib/pkgconfig:$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PETSC_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") -pkg_search_module(PETSC craypetsc_real PETSc) +pkg_search_module(PETSC craypetsc_real petsc PETSc) # Extract major, minor, etc from version string if (PETSC_VERSION) diff --git a/cmake/modules/FindSLEPc.cmake b/cmake/modules/FindSLEPc.cmake index 327cffc23..dec26fcc4 100644 --- a/cmake/modules/FindSLEPc.cmake +++ b/cmake/modules/FindSLEPc.cmake @@ -48,7 +48,7 @@ find_package(PkgConfig REQUIRED) set(ENV{PKG_CONFIG_PATH} "$ENV{SLEPC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{SLEPC_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PETSC_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}:$ENV{PETSC_DIR}:$ENV{PKG_CONFIG_PATH}") -pkg_search_module(SLEPC crayslepc_real SLEPc) +pkg_search_module(SLEPC crayslepc_real slepc SLEPc) # Extract major, minor, etc from version string if (SLEPC_VERSION) -- 2.30.0 0de22b284'>nix/local.mk
AgeCommit message (Expand)Author
2021-10-01build: Don’t delete ‘guix-gc.timer’ file....Without this invoking ‘make clean’ would remove ‘guix-gc.timer’, and ‘make’ would fail with. make[2]: *** No rule to make target 'etc/guix-gc.timer', needed by 'all-am'. Stop. * nix/local.mk (nodist_systemdservice_DATA): Remove ‘guix-gc.timer’. Xinglu Chen
2021-09-20etc: Add systemd files for running ‘guix gc’ periodically...* etc/guix-gc.service.in: New file. * etc/guix-gc.timer: Likewise. * .gitignore: Ignore generated ‘guix-gc.service’. * nix/local.mk (nodist_systemdservice_DATA): Add ‘guix-gc.service’ and ‘guix-gc.timer’. (EXTRA_DIST): Add ‘guix-gc.service.in’ and ‘guix-gc.timer’. * doc/guix.texi (Binary Installation): Mention the new systemd files. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Thiago Jung Bauermann
2021-03-30gnu: guix: Fix openrc init scripts....Fixes <https://bugs.gnu.org/46871>. * gnu/packages/package-management.scm (guix)[arguments]: Fix openrc init. * nix/local.mk (openrcservicedir): Likewise. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> zimoun
2020-10-27maint: Add 'etc/gnu-store.mount.in' to the distribution....Reported by Vagrant Cascadian. * nix/local.mk (EXTRA_DIST): Add 'etc/gnu-store.mount.in'. Ludovic Courtès
2020-09-17guix-install.sh: Support OpenRC....* etc/guix-install.sh (chk_init_sys): Detect OpenRC. (sys_enable_guix_daemon): Install & enable the Guix daemon on such systems. * etc/openrc/guix-daemon.in: New file. * nix/local.mk: Add a rule for it. (openrcservicedir, nodist_openrcservice_DATA): New variables. (CLEANFILES, EXTRA_DIST): Add them. * .gitignore: Ignore etc/openrc/guix-daemon. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> Morgan Smith