On 2020-04-05, at 22:38:39 +0100, Jeremy Sowden wrote: > On 2020-04-05, at 14:32:16 +0200, Andreas Tille wrote: > > On Sun, Apr 05, 2020 at 12:34:55PM +0100, Jeremy Sowden wrote: > > > > > I've attached the part or the build log that seems to be > > > > > autoconf relevant. I admit I'm a bit astonished since I can > > > > > only see warnings but no error ... > > > > > > > > Here's a patch that fixes the autoheader warnings. > > > > > > Whoops. That version doesn't seem to apply. The patch I've > > > attached to this message I have actually tested properly. > > > > > > > autoreconf is still failing. > > > > > > That's not quite right: "autoreconf" fails, but "autoreconf -f > > > -i" (which is what dh_autoreconf does) succeeds. Now > > > dh_auto_configure fails. > > > > I confirm it fails with > > > > ... > > checking if semctl requires semun... no > > checking if fortran compiler works... no > > configure: error: in `/build/mpqc-2.3.1': > > configure: error: fortran compiler does not work > > > > > > I've updated Git with your patch - thanks a lot so far. > > In my case, the problem was: > > ./configure: line 4287: mpicc: command not found > > IOW, missing build-deps. Once I installed those, dh_auto_configure > was happy, but there were compilation failures because autoheader > clobbered src/lib/scconfig.h.in. I've attached two patches which fix > those. Having re-read the autoconf and autoheader doc's this evening, I think the attached fixes are an improvement over yesterday's. J.
From cb556d820337b9e2b24cdc70049e9bca1967c7af Mon Sep 17 00:00:00 2001 From: Jeremy Sowden <jeremy@azazel.net> Date: Sun, 5 Apr 2020 20:22:51 +0100 Subject: [PATCH v2 1/2] shmtype fix. --- debian/patches/series | 1 + debian/patches/shmtype.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 debian/patches/shmtype.patch diff --git a/debian/patches/series b/debian/patches/series index db79d4fb8ff5..c5ef93ff27ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ g++6-constexpr.patch Fix_mpi.patch autoconf.patch autoheader.patch +shmtype.patch diff --git a/debian/patches/shmtype.patch b/debian/patches/shmtype.patch new file mode 100644 index 000000000000..273b16a9dec6 --- /dev/null +++ b/debian/patches/shmtype.patch @@ -0,0 +1,21 @@ +diff --git a/configure.in b/configure.in +index 8ebd2fa89c95..96e7fb7039da 100644 +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,7 @@ define([AC_CACHE_SAVE], )dnl for debugging configure.in + AC_INIT(src/lib/util/ref/ref.h) + AC_PREREQ(2.55) + AC_CONFIG_HEADER(src/lib/scconfig.h) ++AH_BOTTOM([#include "shm_type.h"]) + AC_CONFIG_AUX_DIR(bin) + AC_CONFIG_MACRO_DIR([lib/autoconf]) + +diff --git a/src/lib/shm_type.h b/src/lib/shm_type.h +new file mode 100644 +index 000000000000..8c62fb392b34 +--- /dev/null ++++ b/src/lib/shm_type.h +@@ -0,0 +1,3 @@ ++#ifndef SHMTYPE ++#define SHMTYPE char* ++#endif -- 2.25.1
From 758970c9d0b5928b60b000acd3485cc666827591 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden <jeremy@azazel.net> Date: Sun, 5 Apr 2020 20:58:57 +0100 Subject: [PATCH v2 2/2] restrictxx fix. --- debian/patches/restrictxx.patch | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 debian/patches/restrictxx.patch diff --git a/debian/patches/restrictxx.patch b/debian/patches/restrictxx.patch new file mode 100644 index 000000000000..3730918e8701 --- /dev/null +++ b/debian/patches/restrictxx.patch @@ -0,0 +1,27 @@ +diff --git a/configure.in b/configure.in +index 96e7fb7039da..040b475941c7 100644 +--- a/configure.in ++++ b/configure.in +@@ -8,7 +8,10 @@ define([AC_CACHE_SAVE], )dnl for debugging configure.in + AC_INIT(src/lib/util/ref/ref.h) + AC_PREREQ(2.55) + AC_CONFIG_HEADER(src/lib/scconfig.h) +-AH_BOTTOM([#include "shm_type.h"]) ++AH_BOTTOM([ ++#include "shm_type.h" ++#include "restrictxx.h" ++]) + AC_CONFIG_AUX_DIR(bin) + AC_CONFIG_MACRO_DIR([lib/autoconf]) + +diff --git a/src/lib/restrictxx.h b/src/lib/restrictxx.h +new file mode 100644 +index 000000000000..cacfea3b7db5 +--- /dev/null ++++ b/src/lib/restrictxx.h +@@ -0,0 +1,5 @@ ++#ifdef CXX_RESTRICT ++#define restrictxx restrict ++#else ++#define restrictxx ++#endif diff --git a/debian/patches/series b/debian/patches/series index c5ef93ff27ed..9662a2c679b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ Fix_mpi.patch autoconf.patch autoheader.patch shmtype.patch +restrictxx.patch -- 2.25.1
Attachment:
signature.asc
Description: PGP signature