Re: master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later

Re: master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later

[Glenn Morris]

Paul Eggert wrote:

> branch: master
> commit f0b5d4bd3e17bc0a464b9ec69507413824568f9e
> Author: Paul Eggert <eggert@cs.ucla.edu>
> Commit: Paul Eggert <eggert@cs.ucla.edu>
>
>     Simplify by assuming GnuTLS 2.12.2 or later

This causes --without-gnutls builds to fail.

Ref: http://hydra.nixos.org/build/38241199

  sysdep.c:99:28: fatal error: gnutls/crypto.h: No such file or directory

Re: master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

On 08/03/2016 08:29 AM, Glenn Morris wrote:
> Ref: http://hydra.nixos.org/build/38241199
>    sysdep.c:99:28: fatal error: gnutls/crypto.h: No such file or directory


Thanks, I installed the attached, which should fix that.

Hydra doesn't have the GnuTLS development headers/libraries installed. 
Shouldn't it? Seems a bit odd, since Hydra *builds* GnuTLS....


[-- Attachment #2: 0001-Fix-GnuTLS-includes.txt --]
[-- Type: text/plain, Size: 1505 bytes --]

From 11a3a8ae795412f009d88ab7ec3bc10494a1a849 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 3 Aug 2016 14:20:38 -0700
Subject: [PATCH] Fix GnuTLS includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* src/gnutls.c [HAVE_GNUTLS]: Don’t include gnutls/gnutls.h
a second time; although it doesn’t hurt, it’s not needed.
* src/sysdep.c [!HAVE_GNUTLS]: Don’t include gnutls/crypto.h,
as it may not be available.  Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00100.html
---
 src/gnutls.c | 1 -
 src/sysdep.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gnutls.c b/src/gnutls.c
index d242919..af2ba52 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -26,7 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "coding.h"
 
 #ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
 
 #ifdef WINDOWSNT
 #include <windows.h>
diff --git a/src/sysdep.c b/src/sysdep.c
index 43ff0a1..70cb961 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -95,7 +95,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "gnutls.h"
 /* MS-Windows loads GnuTLS at run time, if available; we don't want to
    do that during startup just to call gnutls_rnd.  */
-#ifndef WINDOWSNT
+#if defined HAVE_GNUTLS && !defined WINDOWSNT
 # include <gnutls/crypto.h>
 #else
 # define emacs_gnutls_global_init() Qnil
-- 
2.5.5

Re: master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later

[Glenn Morris]

Paul Eggert wrote:

> Hydra doesn't have the GnuTLS development headers/libraries installed.

It depends. :)   (NixOS is interesting.)

It's appropriate for the hydra Emacs "tarball" job to have a minimal set
of build dependencies. Eg it helps us catch issues like this one. :)

The "tarball" job essentially just runs "make dist", which then acts as
input for the other hydra build jobs ("build" and "coverage"). These
have a more complete dependency list, including gnutls.