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 b0886c70abb510c80b825f5335ed84'>root/gnu/installer/timezone.scm
AgeCommit message (Expand)Author
2019-02-18gnu: Fix some typos in the installer....* gnu/installer/connman.scm (connman-connect-with-auth): Fix typo in documentation. * gnu/installer/newt/keymap.scm (sort-variants): Likewise. * gnu/installer/newt/page.scm (run-listbox-selection-page): Likewise. * gnu/installer/parted.scm (mkpart): Likewise. * gnu/installer/newt/utils.scm (destroy-form-and-pop): Likewise. * gnu/installer/newt/wifi.scm (run-unknown-error-page): Fix typo. (wifi-listbox-heigth): Rename to… (wifi-listbox-height): …this, and adjust caller. * gnu/installer/timezone.scm (locate-childrens): Rename to… (locate-children): …this. Adjust all callers. Tobias Geerinckx-Rice
2019-01-17installer: Add configuration formatter....* gnu/installer.scm (installer-steps): Add configuration-formatter procedures. * gnu/installer/final.scm: New file. * gnu/installer/locale.scm (locale->configuration): New exported procedure. * gnu/installer/newt.scm (newt-installer): Add final page. * gnu/installer/newt/final.scm: New file. * gnu/installer/record.scm (installer): Add final-page field. * gnu/installer/timezone.scm (posix-tz->configuration): New exported procedure. * gnu/installer/steps.scm (installer-step): Rename configuration-proc field to configuration-formatter. (%installer-configuration-file): New exported parameter, (%installer-target-dir): ditto, (%configuration-file-width): ditto, (format-configuration): new exported procedure, (configuration->file): new exported procedure. Mathieu Othacehe
2019-01-17gnu: Add graphical installer support....* configure.ac: Require that guile-newt is available. * gnu/installer.scm: New file. * gnu/installer/aux-files/logo.txt: New file. * gnu/installer/build-installer.scm: New file. * gnu/installer/connman.scm: New file. * gnu/installer/keymap.scm: New file. * gnu/installer/locale.scm: New file. * gnu/installer/newt.scm: New file. * gnu/installer/newt/ethernet.scm: New file. * gnu/installer/newt/hostname.scm: New file. * gnu/installer/newt/keymap.scm: New file. * gnu/installer/newt/locale.scm: New file. * gnu/installer/newt/menu.scm: New file. * gnu/installer/newt/network.scm: New file. * gnu/installer/newt/page.scm: New file. * gnu/installer/newt/timezone.scm: New file. * gnu/installer/newt/user.scm: New file. * gnu/installer/newt/utils.scm: New file. * gnu/installer/newt/welcome.scm: New file. * gnu/installer/newt/wifi.scm: New file. * gnu/installer/steps.scm: New file. * gnu/installer/timezone.scm: New file. * gnu/installer/utils.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files. * gnu/system.scm: Export %root-account. * gnu/system/install.scm (%installation-services): Use kmscon instead of linux VT for all tty. (installation-os)[users]: Add the graphical installer as shell of the root account. [packages]: Add font related packages. * po/guix/POTFILES.in: Add installer files. Mathieu Othacehe