diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2024-05-05 23:05:51 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2024-05-06 23:16:51 +0300 |
commit | 2423b0bb2df182f77aeb89dca9c44e99a0e7a2d2 (patch) | |
tree | b6e0a17da3cd0128da949fa1701243124d718ef7 | |
parent | 38733b5039eaf00167882f18ea763b8cb180c967 (diff) | |
download | guix-2423b0bb2df182f77aeb89dca9c44e99a0e7a2d2.tar.gz guix-2423b0bb2df182f77aeb89dca9c44e99a0e7a2d2.zip |
gnu: strongswan: Fix building on non-x86 architectures.
* gnu/packages/vpn.scm (strongswan)[arguments]: When building for
not-x86 architectures disable aesni support. Also adjust the test suite
so we skip the RSA tests.
Change-Id: Idbc7bb229b83b0f43f3286b94fa4da077711c0ed
-rw-r--r-- | gnu/packages/vpn.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 7823ef19eb..6a957638e3 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net> -;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019, 2021, 2022, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018, 2020 Pierre Langlois <pierre.langlois@gmx.com> @@ -421,7 +421,11 @@ networks bypassing intermediate firewalls.") (add-before 'check 'set-up-test-environment (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo"))))) + (search-input-directory inputs "share/zoneinfo")) + ;; Speed-up the test suite on some of the architectures. + ,@(if (not (target-x86?)) + `((setenv "TESTS_SUITES_EXCLUDE" "rsa")) + '())))) #:configure-flags (list "--disable-ldap" @@ -435,7 +439,10 @@ networks bypassing intermediate firewalls.") ;; Make it usable. The default configuration is far too minimal to be ;; used with most common VPN set-ups. ;; See <https://wiki.strongswan.org/projects/strongswan/wiki/Autoconf>. - "--enable-aesni" + ;; AESNI expects on hardware support from x86 systems. + ,@(if (target-x86?) + `("--enable-aesni") + `("--disable-aesni")) "--enable-attr-sql" "--enable-chapoly" "--enable-curl" |