[gnutls-devel] GnuTLS | guile: Arrange to make 'gnutls.scm' architecture-independent. (!1121)

[Development of GNU's TLS library]

Andreas Metzler commented:


The only difference I see post-patch is this one:
~~~
--- 0.old/usr/share/guile/site/2.2/gnutls.scm	2019-11-29 19:10:46.922255125 +0100
+++ 1.new/usr/share/guile/site/2.2/gnutls.scm	2019-11-29 19:08:53.512220016 +0100
@@ -519,10 +519,15 @@
 (eval-when (expand load eval)
   (define %libdir
     (or (getenv "GNUTLS_GUILE_EXTENSION_DIR")
+
+        ;; The .scm file is supposed to be architecture-independent.  Thus,
+        ;; save 'extensiondir' only if it's different from what Guile expects.
         "/usr/lib/x86_64-linux-gnu/guile/2.2/extensions"))
 
   (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
-    (load-extension (string-append %libdir "/guile-gnutls-v-2")
+    (load-extension (if %libdir
+                        (string-append %libdir "/guile-gnutls-v-2")
+                        "guile-gnutls-v-2")
                     "scm_init_gnutls")))
 
 (cond-expand

-- 
Reply to this email directly or view it on GitLab: https://gitlab.com/gnutls/gnutls/merge_requests/1121#note_252516974
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gnupg.org/pipermail/gnutls-devel/attachments/20191129/82e69d0d/attachment.html>