[silo-llnl] 28/96: Use autoconf-archive
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 104e431bfde69551f32c3b37e0885b3f8be74f92
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Sep 6 12:11:40 2011 +0100
Use autoconf-archive
---
debian/changelog | 3 +-
debian/control | 2 +-
debian/patches/autoreconf.patch | 92 +++++++++++++++++++++++++++++++++++++++--
3 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d4da8b..92ddf41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
silo-llnl (4.8-6) unstable; urgency=low
* Fixes needed to make autoreconf -fiv work correctly. Closes: #619830.
+ * B-D autoconf-archive to include AX_CHECK_COMPILE_FLAG needed now.
- -- Alastair McKinstry <mckinstry at debian.org> Mon, 05 Sep 2011 11:32:49 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 06 Sep 2011 12:11:02 +0100
silo-llnl (4.8-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6587c94..22f35cf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: silo-llnl
Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, libqt4-dev, gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev
+Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, libqt4-dev, gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive
Build-Conflicts: qt3-dev-tools
Standards-Version: 3.9.2
Homepage: https://wci.llnl.gov/codes/silo
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
index 69b1d36..943c8ac 100644
--- a/debian/patches/autoreconf.patch
+++ b/debian/patches/autoreconf.patch
@@ -1,12 +1,15 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Fixes needed for autoreconf to work on Debian
+ When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
+ Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
+ AX_CHECK_COMPILER_FLAGS() is obsolete
Last-Updated: 2011-09-05
Forwarded: no
Index: silo-llnl-4.8/configure.ac
===================================================================
---- silo-llnl-4.8.orig/configure.ac 2011-09-05 09:54:16.000000000 +0100
-+++ silo-llnl-4.8/configure.ac 2011-09-05 11:29:14.000000000 +0100
+--- silo-llnl-4.8.orig/configure.ac 2011-09-05 12:27:24.000000000 +0100
++++ silo-llnl-4.8/configure.ac 2011-09-05 12:32:53.000000000 +0100
@@ -362,6 +362,9 @@
dnl
dnl Alastair McKinstry, Fri Aug 25 17:24:00 BST 2011
@@ -26,6 +29,21 @@ Index: silo-llnl-4.8/configure.ac
dnl
dnl Handle the python module right away to determine if we need shared libs.
dnl Ordinarily, we default to static libs
+@@ -772,10 +777,10 @@
+ # it is an argument to the -D argument. So, I think this is
+ # just totally bogus!
+ # Default to large file support
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
+-AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
+-AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
++AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
++AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
+
+ #
+ # Note: regardless of what the stuff above regarding large file support
@@ -1462,12 +1467,12 @@
tools/python/Makefile
tools/silex/Makefile
@@ -47,8 +65,8 @@ Index: silo-llnl-4.8/configure.ac
else
Index: silo-llnl-4.8/src/Makefile.am
===================================================================
---- silo-llnl-4.8.orig/src/Makefile.am 2011-09-05 10:06:26.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am 2011-09-05 11:10:43.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.am 2011-09-05 12:27:24.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am 2011-09-05 12:27:24.000000000 +0100
@@ -75,17 +75,17 @@
DRIVER_DIRS += taurus
DRIVER_LIBS += taurus/libsilo_taurus.la
@@ -76,3 +94,69 @@ Index: silo-llnl-4.8/src/Makefile.am
pdb pdb_drv pdbp_drv score silo taurus unknown
MAKESETTINGS = make.settings
+Index: silo-llnl-4.8/config/vl_lib_readline.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ silo-llnl-4.8/config/vl_lib_readline.m4 2011-09-05 12:28:37.000000000 +0100
+@@ -0,0 +1,62 @@
++#
++# SYNOPSIS
++#
++# VL_LIB_READLINE
++#
++# DESCRIPTION
++#
++# Searches for a readline compatible library. If found, defines
++# `HAVE_LIBREADLINE'. If the found library has the `add_history'
++# function, sets also `HAVE_READLINE_HISTORY'. Also checks for the
++# locations of the necessary include files and sets `HAVE_READLINE_H'
++# or `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++# 'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++# The libraries that may be readline compatible are `libedit',
++# `libeditline' and `libreadline'. Sometimes we need to link a
++# termcap library for readline to work, this macro tests these cases
++# too by trying to link with `libtermcap', `libcurses' or
++# `libncurses' before giving up.
++#
++# Here is an example of how to use the information provided by this
++# macro to perform the necessary includes or declarations in a C
++# file:
++#
++# #ifdef HAVE_LIBREADLINE
++# # if defined(HAVE_READLINE_READLINE_H)
++# # include <readline/readline.h>
++# # elif defined(HAVE_READLINE_H)
++# # include <readline.h>
++# # else /* !defined(HAVE_READLINE_H) */
++# extern char *readline ();
++# # endif /* !defined(HAVE_READLINE_H) */
++# char *cmdline = NULL;
++# #else /* !defined(HAVE_READLINE_READLINE_H) */
++# /* no readline */
++# #endif /* HAVE_LIBREADLINE */
++#
++# #ifdef HAVE_READLINE_HISTORY
++# # if defined(HAVE_READLINE_HISTORY_H)
++# # include <readline/history.h>
++# # elif defined(HAVE_HISTORY_H)
++# # include <history.h>
++# # else /* !defined(HAVE_HISTORY_H) */
++# extern void add_history ();
++# extern int write_history ();
++# extern int read_history ();
++# # endif /* defined(HAVE_READLINE_HISTORY_H) */
++# /* no history */
++# #endif /* HAVE_READLINE_HISTORY */
++#
++# LAST MODIFICATION
++#
++# 2002-04-04
++#
++# COPYLEFT
++#
++# Copyright (c) 2002 Ville Laurikari <vl at iki.fi>
++#
++# Copying and distribution of this file, with or without
++# modification, are permitted in any medium without royalty provided
++# the copyright notice and this notice are preserved.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list