Not sent upstream. From e23de62e28f64599148ff06e439fac116a391299 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 07:24:48 +0200 Subject: [PATCH] guile: Cross build fix. To cross-build, both the host guile and the native guile-for-build must be available. If the native guile is not available, no snarfing is done and the guile cross build is skipped. During the cross-build gnutls.scm does not load when compliling extra.scm, becase of missing definitions from guile-gnutls-v-2. * guile/modules/gnutls.in (protocol/ssl-3 protocol/tls-1.0, protocol/tls-1.1, credentials/anonymous, cipher/rijndael-256-cbc, cipher/rijndael-128-cbc, cipher/rijndael-cbc, cipher/arcfour-128, certificate-verify/allow-any-x509-v1-ca-certificate, certificate-verify/allow-x509-v1-ca-certificate): Define to #f initially. When "GNUTLS_GUILE_CROSS_COMPILING" not set, set! to value from "guile-gnutls-v-2" load-extension C module. --- guile/modules/gnutls.in | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in index 6461c404a..954e315de 100644 --- a/guile/modules/gnutls.in +++ b/guile/modules/gnutls.in @@ -564,22 +564,36 @@ This defines 'variable' as an alias for 'alias', and emits a warning when (identifier? #'id) #'alias)))))))))) - ;; Renaming. -(define protocol/ssl-3 protocol/ssl3) -(define protocol/tls-1.0 protocol/tls1-0) -(define protocol/tls-1.1 protocol/tls1-1) +(define protocol/ssl-3 #f) +(define protocol/tls-1.0 #f) +(define protocol/tls-1.1 #f) ;; Aliases. -(define credentials/anonymous credentials/anon) -(define cipher/rijndael-256-cbc cipher/aes-256-cbc) -(define cipher/rijndael-128-cbc cipher/aes-128-cbc) -(define cipher/rijndael-cbc cipher/aes-128-cbc) -(define cipher/arcfour-128 cipher/arcfour) -(define certificate-verify/allow-any-x509-v1-ca-certificate - certificate-verify/allow-any-x509-v1-ca-crt) -(define certificate-verify/allow-x509-v1-ca-certificate - certificate-verify/allow-x509-v1-ca-crt) +(define credentials/anonymous #f) +(define cipher/rijndael-256-cbc #f) +(define cipher/rijndael-128-cbc #f) +(define cipher/rijndael-cbc #f) +(define cipher/arcfour-128 #f) +(define certificate-verify/allow-any-x509-v1-ca-certificate #f) +(define certificate-verify/allow-x509-v1-ca-certificate #f) + +(unless (getenv "GNUTLS_GUILE_CROSS_COMPILING") + ;; Renaming. + (set! protocol/ssl-3 protocol/ssl3) + (set! protocol/tls-1.0 protocol/tls1-0) + (set! protocol/tls-1.1 protocol/tls1-1) + + ;; Aliases. + (set! credentials/anonymous credentials/anon) + (set! cipher/rijndael-256-cbc cipher/aes-256-cbc) + (set! cipher/rijndael-128-cbc cipher/aes-128-cbc) + (set! cipher/rijndael-cbc cipher/aes-128-cbc) + (set! cipher/arcfour-128 cipher/arcfour) + (set! certificate-verify/allow-any-x509-v1-ca-certificate + certificate-verify/allow-any-x509-v1-ca-crt) + (set! certificate-verify/allow-x509-v1-ca-certificate + certificate-verify/allow-x509-v1-ca-crt)) ;; Deprecated OpenPGP bindings. (define-deprecated certificate-type/openpgp) -- 2.26.0 re): Remove variable. (coq-stdlib): Remove variable. (coq-ide)[propagated-inputs]: Add zlib. (coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core. (coq-mathcomp-finmap)[inputs]: Remove coq-stdlib. (coq-equations): Update to 1.3-8.17. * gnu/packages/patches/coq-fix-envvars.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Co-authored-by: Josselin Poiret <dev@jpoiret.xyz> Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: I0a0d9f7a6e06dd19ce1b66051334476d85f4f195 pukkamustard 2024-02-08gnu: Update coq-interval to 4.8.0....* gnu/packages/coq.scm (coq-interval): Update to 4.8.0. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: I17e2426aacd84289eff538a195b79683eb98fe9f pukkamustard 2024-02-08gnu: Update coq-stdpp to 1.8.0....* gnu/packages/coq.scm (coq-stdpp): Update to 1.8.0. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: Id44b29296fa6de706b0a3eac90616ba0de126f87 pukkamustard 2024-02-08gnu: Update coq-autosubst to 1.8....* gnu/packages/coq.scm (coq-autosubst): Update to 1.8. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: I36b226afd3ed043977c6188dcb6bdeaf2e402de8 pukkamustard 2024-02-08gnu: Update coq-mathcomp to 1.17.0....* gnu/packages/coq.scm (coq-mathcomp): Update to 1.17.0. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: Ia8397f94b7158128e6473811355a2c596c98970b pukkamustard 2024-02-08gnu: Update coq-coquelicot to 3.4.0....* gnu/packages/coq.scm (coq-coquelicot): Update to 3.4.0. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: I14c18abdbb7bebea75ac26be9c4c1954778cef22 pukkamustard 2024-02-08gnu: Update coq-gappa to 1.5.3....* gnu/packages/coq.scm (coq-gappa): Update to 1.5.3. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: Icc124d8a2d7a55717651d135d6817871b5bc6321 pukkamustard 2024-02-08gnu: Update coq-flocq to 4.1.1....* gnu/packages/coq.scm (coq-flocq): Update to 4.1.1. Signed-off-by: Julien Lepiller <julien@lepiller.eu> Change-Id: Ib2d8fb4701d03a5e796736ab5b2a30dc6897dc22 pukkamustard 2023-11-23gnu: Add coq-for-coqtail....* gnu/packages/coq.scm (coq-for-coqtail): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Change-Id: I0c08a02f7937786b52039307c1019ae3474e625c Jean-Pierre De Jesus DIAZ