On 2020-04-05, at 12:13:45 +0100, Jeremy Sowden wrote: > On 2020-04-05, at 12:45:47 +0200, Andreas Tille wrote: > > On Sun, Apr 05, 2020 at 10:14:58AM +0100, Jeremy Sowden wrote: > > > > Any help would be appreciated. > > > > > > > > [1] https://salsa.debian.org/debichem-team/mpqc > > > > > > Adding AC_CONFIG_MACRO_DIR to configure.in appears to fix it > > > (patch attached). > > > > Thanks a lot for the promising patch I have commited to Git[1]. > > Unfortunately the build does not yet succeed in a pbuilder chroot. > > 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. J.
diff --git a/debian/patches/autoheader.patch b/debian/patches/autoheader.patch new file mode 100644 index 000000000000..f00d772e29ef --- /dev/null +++ b/debian/patches/autoheader.patch @@ -0,0 +1,69 @@ +diff --git a/configure.in b/configure.in +index 99a09d38b3c2..c183ac3ef252 100644 +--- a/configure.in ++++ b/configure.in +@@ -11,6 +11,8 @@ AC_CONFIG_HEADER(src/lib/scconfig.h) + AC_CONFIG_AUX_DIR(bin) + AC_CONFIG_MACRO_DIR([lib/autoconf]) + ++AC_DEFINE_HEADER_TEMPLATES ++ + AC_CANONICAL_SYSTEM + + AC_DEFINE_UNQUOTED(HOST_ARCH, "$host") +diff --git a/lib/autoconf/templates.m4 b/lib/autoconf/templates.m4 +new file mode 100644 +index 000000000000..693d54289326 +--- /dev/null ++++ b/lib/autoconf/templates.m4 +@@ -0,0 +1,50 @@ ++AC_DEFUN([AC_DEFINE_HEADER_TEMPLATES],[ ++AH_TEMPLATE([ALWAYS_USE_MPI], []) ++AH_TEMPLATE([CXX_RESTRICT], []) ++AH_TEMPLATE([DEFAULT_ARMCI], []) ++AH_TEMPLATE([DEFAULT_MPI], []) ++AH_TEMPLATE([DEFAULT_MTMPI], []) ++AH_TEMPLATE([DEFAULT_SC_MEMORY], []) ++AH_TEMPLATE([EXPLICIT_TEMPLATE_INSTANTIATION], []) ++AH_TEMPLATE([HAVE_ARMCI], []) ++AH_TEMPLATE([HAVE_BACKTRACE], []) ++AH_TEMPLATE([HAVE_CCA_CHEM_HEADERS], []) ++AH_TEMPLATE([HAVE_CCA_SPEC_BABEL_HEADERS], []) ++AH_TEMPLATE([HAVE_FCHDIR], []) ++AH_TEMPLATE([HAVE_IOS_FMTFLAGS], []) ++AH_TEMPLATE([HAVE_ISNAN], []) ++AH_TEMPLATE([HAVE_LIBDERIV], []) ++AH_TEMPLATE([HAVE_LIBINT], []) ++AH_TEMPLATE([HAVE_LIBR12], []) ++AH_TEMPLATE([HAVE_LONG_LONG], []) ++AH_TEMPLATE([HAVE_MPI], []) ++AH_TEMPLATE([HAVE_MPIIO], []) ++AH_TEMPLATE([HAVE_MPIPP], []) ++AH_TEMPLATE([HAVE_MPI_INIT_THREAD], []) ++AH_TEMPLATE([HAVE_NIAMA], []) ++AH_TEMPLATE([HAVE_PERF], []) ++AH_TEMPLATE([HAVE_PTHREAD], []) ++AH_TEMPLATE([HAVE_PUBSEEKOFF], []) ++AH_TEMPLATE([HAVE_SCALABLE_BLAS], []) ++AH_TEMPLATE([HAVE_SEEKOFF], []) ++AH_TEMPLATE([HAVE_SGETN], []) ++AH_TEMPLATE([HAVE_SIDL_HEADERS], []) ++AH_TEMPLATE([HAVE_SYSV_IPC], []) ++AH_TEMPLATE([HAVE_TYPENAME], []) ++AH_TEMPLATE([HOST_ARCH], []) ++AH_TEMPLATE([INSTALLED_SCLIBDIR], []) ++AH_TEMPLATE([REF_OPTIMIZE], []) ++AH_TEMPLATE([SCDATADIR], []) ++AH_TEMPLATE([SC_BUILDID], []) ++AH_TEMPLATE([SC_MAJOR_VERSION], []) ++AH_TEMPLATE([SC_MICRO_VERSION], []) ++AH_TEMPLATE([SC_MINOR_VERSION], []) ++AH_TEMPLATE([SC_MPI_THREAD_LEVEL], []) ++AH_TEMPLATE([SC_VERSION], []) ++AH_TEMPLATE([SEMCTL_REQUIRES_SEMUN], []) ++AH_TEMPLATE([SIGHASELLIP], []) ++AH_TEMPLATE([SRC_SCLIBDIR], []) ++AH_TEMPLATE([TARGET_ARCH], []) ++AH_TEMPLATE([USING_NAMESPACE_STD], []) ++AH_TEMPLATE([WORDS_BIGENDIAN], []) ++]) diff --git a/debian/patches/series b/debian/patches/series index d700ae497e80..db79d4fb8ff5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ g++6-constexpr.patch Fix_mpi.patch autoconf.patch +autoheader.patch
Attachment:
signature.asc
Description: PGP signature