[adios] 06/18: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Oct 28 11:18:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.10.1-1
in repository adios.
commit e51cf88c6cf970e1c1bc9636f11b97758bc12f5c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Oct 3 18:01:36 2016 +0100
refresh patches
---
debian/changelog | 3 +
debian/patches/autotools-fixes.patch | 17 -
debian/patches/debian_paths.patch | 50 +--
debian/patches/exclude_cmake.patch | 8 +-
debian/patches/mpi4py_fix.patch | 14 +-
debian/patches/numpy_paths.patch | 22 +-
debian/patches/pkgconfig.patch | 792 ++---------------------------------
debian/patches/python_wrapper.patch | 39 +-
debian/patches/security.patch | 5 -
debian/patches/series | 1 -
debian/patches/sh4.patch | 7 -
11 files changed, 88 insertions(+), 870 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4052949..588af9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
adios (1.10.1-1) UNRELEASED; urgency=medium
* New upstream release
+ - sh4.patch obsolete
+ - python3 now supported natively
+ - security.patch now merged upstream
* DH_COMPAT=10
-- Alastair McKinstry <mckinstry at debian.org> Mon, 03 Oct 2016 15:07:36 +0100
diff --git a/debian/patches/autotools-fixes.patch b/debian/patches/autotools-fixes.patch
deleted file mode 100644
index e8678ac..0000000
--- a/debian/patches/autotools-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Remove indented comments that autotools now choke on
-Last-Updated: 2015-06-15
-Forwarded: no
-
-Index: adios-1.9.0/Makefile.am
-===================================================================
---- adios-1.9.0.orig/Makefile.am
-+++ adios-1.9.0/Makefile.am
-@@ -53,7 +53,5 @@ install-data-hook:
- echo "GITSTAT=\"git status not available\"" >> adios_git_status; \
- echo "Note: git command not found or $(PWD) is not a git repository."; \
- fi
-- #$(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
-- #$(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
-
- CLEANFILES =
diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index 6b0941a..2a871d2 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,11 +3,11 @@ Description: Change paths to match Debian and FHS
Forwarded: no
Last-Updated: 2013-12-09
-Index: adios-1.9.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.10.1/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.9.0.orig/utils/skel/lib/skel_makefile.py
-+++ adios-1.9.0/utils/skel/lib/skel_makefile.py
-@@ -67,7 +67,7 @@ def generate_makefile_from_yaml (args):
+--- adios-1.10.1.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.10.1/utils/skel/lib/skel_makefile.py
+@@ -65,7 +65,7 @@ def generate_makefile_from_yaml (args):
# Only proceed if outfilename does not already exist, or if -f was used
if os.path.exists (outfilename) and not args.force:
@@ -16,7 +16,7 @@ Index: adios-1.9.0/utils/skel/lib/skel_makefile.py
return 999
skel_file = open (outfilename, 'w')
-@@ -108,7 +108,7 @@ def generate_makefiles_fortran (params):
+@@ -106,7 +106,7 @@ def generate_makefiles_fortran (params):
makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
@@ -25,41 +25,31 @@ Index: adios-1.9.0/utils/skel/lib/skel_makefile.py
bindir = os.path.abspath(os.path.dirname(sys.argv[0]))
-Index: adios-1.9.0/utils/skel/lib/skel_settings.py
+Index: adios-1.10.1/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.9.0.orig/utils/skel/lib/skel_settings.py
-+++ adios-1.9.0/utils/skel/lib/skel_settings.py
-@@ -54,7 +54,7 @@ def create_settings_dir_if_needed():
+--- adios-1.10.1.orig/utils/skel/lib/skel_settings.py
++++ adios-1.10.1/utils/skel/lib/skel_settings.py
+@@ -54,7 +54,8 @@ def create_settings_dir_if_needed():
skel_settings_dir_name = os.path.expanduser ('~/.skel')
if not os.path.exists (skel_settings_dir_name):
bindir = os.path.dirname (sys.argv[0])
- shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
+ shutil.copytree ('/etc/adios/skel', skel_settings_dir_name)
- print('Created ' + skel_settings_dir_name)
++
+ print 'Created ' + skel_settings_dir_name
-Index: adios-1.9.0/utils/gpp/ad_config.py
-===================================================================
---- adios-1.9.0.orig/utils/gpp/ad_config.py
-+++ adios-1.9.0/utils/gpp/ad_config.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from __future__ import absolute_import, division, print_function, unicode_literals
- import xml.dom.minidom
- import type_mapper
-@@ -104,7 +105,7 @@ class adiosGroup:
- # Returns the variable from this group with the specified name, or None
- def get_var (self, varfullpath):
- #print ' get_var('+varfullpath+')'
-- if self.vardict.has_key (varfullpath):
-+ if varfullpath in self.vardict:
- return self.vardict [varfullpath]
+@@ -64,6 +65,3 @@ def main(argv=None):
- return None
-Index: adios-1.9.0/utils/gpp/type_mapper.py
+ if __name__ == "__main__":
+ main()
+-
+-
+-
+Index: adios-1.10.1/utils/gpp/type_mapper.py
===================================================================
---- adios-1.9.0.orig/utils/gpp/type_mapper.py
-+++ adios-1.9.0/utils/gpp/type_mapper.py
+--- adios-1.10.1.orig/utils/gpp/type_mapper.py
++++ adios-1.10.1/utils/gpp/type_mapper.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
diff --git a/debian/patches/exclude_cmake.patch b/debian/patches/exclude_cmake.patch
index bc9e1e6..9736e9a 100644
--- a/debian/patches/exclude_cmake.patch
+++ b/debian/patches/exclude_cmake.patch
@@ -4,11 +4,11 @@ Bug-Debian: http://bugs.debian.org/784766
Forwarded: no
Last-Update: 2015-05-11
-Index: adios-1.9.0/Makefile.am
+Index: adios-1.10.1/Makefile.am
===================================================================
---- adios-1.9.0.orig/Makefile.am
-+++ adios-1.9.0/Makefile.am
-@@ -29,7 +29,7 @@ if HAVE_NSSI
+--- adios-1.10.1.orig/Makefile.am
++++ adios-1.10.1/Makefile.am
+@@ -35,7 +35,7 @@ if HAVE_NSSI
scripts/start.nssi.staging.sh
endif
diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
index 0f3e9d8..9be72c2 100644
--- a/debian/patches/mpi4py_fix.patch
+++ b/debian/patches/mpi4py_fix.patch
@@ -3,10 +3,10 @@ Description: Fix for missing MPI_Message in MPI < 3
Last-Updated: 2015-10-29
Forwarded: no
-Index: adios-1.9.0/wrappers/numpy/compat.h
+Index: adios-1.10.1/wrappers/numpy/compat.h
===================================================================
--- /dev/null
-+++ adios-1.9.0/wrappers/numpy/compat.h
++++ adios-1.10.1/wrappers/numpy/compat.h
@@ -0,0 +1,9 @@
+/* Added to fix missing MPI_Message in older openmpi on Debian, etc
+ * Added mckinstry at debian.org, 2014-05-19
@@ -17,12 +17,12 @@ Index: adios-1.9.0/wrappers/numpy/compat.h
+typedef void *PyMPI_MPI_Message;
+#define MPI_Message PyMPI_MPI_Message
+#endif
-Index: adios-1.9.0/wrappers/numpy/adios_mpi.pyx
+Index: adios-1.10.1/wrappers/numpy/adios_mpi.pyx
===================================================================
---- adios-1.9.0.orig/wrappers/numpy/adios_mpi.pyx
-+++ adios-1.9.0/wrappers/numpy/adios_mpi.pyx
-@@ -10,6 +10,8 @@ cimport numpy as np
- import mpi4py.MPI as MPI
+--- adios-1.10.1.orig/wrappers/numpy/adios_mpi.pyx
++++ adios-1.10.1/wrappers/numpy/adios_mpi.pyx
+@@ -16,6 +16,8 @@ cimport numpy as np
+ import mpi4py.MPI as MPI
cimport mpi4py.MPI as MPI
+cdef extern from 'compat.h': pass
diff --git a/debian/patches/numpy_paths.patch b/debian/patches/numpy_paths.patch
index 3100208..dc2d034 100644
--- a/debian/patches/numpy_paths.patch
+++ b/debian/patches/numpy_paths.patch
@@ -3,25 +3,25 @@ Description: Hack to enable wrappers to work in-situ during build for testing
Last-Updated: 2015-12-30
Forwarded: not-needed
-Index: adios-1.9.0/wrappers/numpy/setup.py
+Index: adios-1.10.1/wrappers/numpy/setup.py
===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup.py
-+++ adios-1.9.0/wrappers/numpy/setup.py
-@@ -17,7 +17,7 @@ import sys
- m1 = Extension('adios',
- sources=['adios.cpp'],
+--- adios-1.10.1.orig/wrappers/numpy/setup.py
++++ adios-1.10.1/wrappers/numpy/setup.py
+@@ -18,7 +18,7 @@ from subprocess import check_output
+ m1 = Extension('adios.adios',
+ sources=['adios.cpp'],
define_macros=[('_NOMPI', None)],
- include_dirs = [np.get_include()],
+ include_dirs = [np.get_include(), '../../src/public'],
library_dirs = [],
libraries = [],
extra_objects = [],
-Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
+Index: adios-1.10.1/wrappers/numpy/setup_mpi.py
===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.9.0/wrappers/numpy/setup_mpi.py
-@@ -27,7 +27,7 @@ def _do_usage():
- sys.exit(0)
+--- adios-1.10.1.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.10.1/wrappers/numpy/setup_mpi.py
+@@ -27,7 +27,7 @@ import argparse
+ # sys.exit(0)
# Default option values
-include_dirs = []
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 6663084..df105ee 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: pkgconfig support for ADIOS in Debian
Last-Updated: 2014-06-15
Forwarded: no
-Index: adios-1.9.0/adios.pc.in
+Index: adios-1.10.1/adios.pc.in
===================================================================
--- /dev/null
-+++ adios-1.9.0/adios.pc.in
++++ adios-1.10.1/adios.pc.in
@@ -0,0 +1,53 @@
+# Standard defines for pkg-config
+prefix=@prefix@
@@ -61,33 +61,19 @@ Index: adios-1.9.0/adios.pc.in
+Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
+Libs: ${ADIOS_CLIB}
+Libs.private: -ldl
-Index: adios-1.9.0/configure.ac
+Index: adios-1.10.1/Makefile.am
===================================================================
---- adios-1.9.0.orig/configure.ac
-+++ adios-1.9.0/configure.ac
-@@ -839,6 +839,7 @@ AC_CONFIG_FILES([Makefile
- examples/Fortran/schema/Makefile
- adios_config
- adios_config.flags
-+ adios.pc
- src/public/adios_version.h
- ])
-
-Index: adios-1.9.0/Makefile.am
-===================================================================
---- adios-1.9.0.orig/Makefile.am
-+++ adios-1.9.0/Makefile.am
-@@ -9,7 +9,8 @@ EXTRA_DIST = runconf \
- scripts/create.nssi.config.sh \
+--- adios-1.10.1.orig/Makefile.am
++++ adios-1.10.1/Makefile.am
+@@ -15,6 +15,7 @@ EXTRA_DIST = runconf \
scripts/kill.nssi.staging.sh \
scripts/start.nssi.staging.sh \
-- scripts/FindADIOS.cmake
-+ scripts/FindADIOS.cmake \
-+ adios.pc
+ scripts/FindADIOS.cmake \
++ adios.pc \
+ src/mxml/cmake_try_longlong.c
# wrappers/matlab/Makefile \
- # wrappers/matlab/adios.m \
-@@ -20,7 +21,7 @@ EXTRA_DIST = runconf \
+@@ -26,7 +27,7 @@ EXTRA_DIST = runconf \
# wrappers/matlab/adiosopenc.c \
# wrappers/matlab/adiosreadc.c
@@ -96,313 +82,11 @@ Index: adios-1.9.0/Makefile.am
if HAVE_NSSI
bin_SCRIPTS += scripts/create.nssi.config.sh \
-Index: adios-1.9.0/Makefile.in
+Index: adios-1.10.1/Makefile.in
===================================================================
---- adios-1.9.0.orig/Makefile.in
-+++ adios-1.9.0/Makefile.in
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.15 from Makefile.am.
- # @configure_input@
-
--# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
--# Inc.
-+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +16,61 @@
-
-
- VPATH = @srcdir@
-+am__is_gnu_make = { \
-+ if test -z '$(MAKELEVEL)'; then \
-+ false; \
-+ elif test -n '$(MAKE_HOST)'; then \
-+ true; \
-+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-+ true; \
-+ else \
-+ false; \
-+ fi; \
-+}
-+am__make_running_with_option = \
-+ case $${target_option-} in \
-+ ?) ;; \
-+ *) echo "am__make_running_with_option: internal error: invalid" \
-+ "target option '$${target_option-}' specified" >&2; \
-+ exit 1;; \
-+ esac; \
-+ has_opt=no; \
-+ sane_makeflags=$$MAKEFLAGS; \
-+ if $(am__is_gnu_make); then \
-+ sane_makeflags=$$MFLAGS; \
-+ else \
-+ case $$MAKEFLAGS in \
-+ *\\[\ \ ]*) \
-+ bs=\\; \
-+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
-+ esac; \
-+ fi; \
-+ skip_next=no; \
-+ strip_trailopt () \
-+ { \
-+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+ }; \
-+ for flg in $$sane_makeflags; do \
-+ test $$skip_next = yes && { skip_next=no; continue; }; \
-+ case $$flg in \
-+ *=*|--*) continue;; \
-+ -*I) strip_trailopt 'I'; skip_next=yes;; \
-+ -*I?*) strip_trailopt 'I';; \
-+ -*O) strip_trailopt 'O'; skip_next=yes;; \
-+ -*O?*) strip_trailopt 'O';; \
-+ -*l) strip_trailopt 'l'; skip_next=yes;; \
-+ -*l?*) strip_trailopt 'l';; \
-+ -[dEDm]) skip_next=yes;; \
-+ -[JT]) skip_next=yes;; \
-+ esac; \
-+ case $$flg in \
-+ *$$target_option*) has_opt=yes; break;; \
-+ esac; \
-+ done; \
-+ test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -40,15 +94,6 @@ host_triplet = @host@
- @HAVE_NSSI_TRUE@ scripts/start.nssi.staging.sh
-
- subdir = .
--DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-- $(srcdir)/Makefile.in $(srcdir)/adios_config.flags.in \
-- $(srcdir)/adios_config.in $(srcdir)/config.h.in \
-- $(top_srcdir)/configure \
-- $(top_srcdir)/src/public/adios_version.h.in \
-- $(top_srcdir)/utils/skel/lib/skel_have_adios_timing.py.in \
-- AUTHORS COPYING ChangeLog INSTALL NEWS TODO config/compile \
-- config/config.guess config/config.sub config/depcomp \
-- config/install-sh config/ltmain.sh config/missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/config/ac_alacrity.m4 \
- $(top_srcdir)/config/ac_aplod.m4 \
-@@ -90,12 +135,15 @@ am__aclocal_m4_deps = $(top_srcdir)/conf
- $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-+ $(am__configure_deps) $(am__DIST_COMMON)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = utils/skel/lib/skel_have_adios_timing.py \
-- adios_config adios_config.flags src/public/adios_version.h
-+ adios_config adios_config.flags adios.pc \
-+ src/public/adios_version.h
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -118,33 +166,95 @@ am__nobase_list = $(am__nobase_strip_set
- am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__uninstall_files_from_dir = { \
-+ test -z "$$files" \
-+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-+ $(am__cd) "$$dir" && rm -f $$files; }; \
-+ }
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"
- SCRIPTS = $(bin_SCRIPTS)
-+AM_V_P = $(am__v_P_ at AM_V@)
-+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_ at AM_V@)
-+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo " GEN " $@;
-+am__v_GEN_1 =
-+AM_V_at = $(am__v_at_ at AM_V@)
-+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-+am__v_at_0 = @
-+am__v_at_1 =
- SOURCES =
- DIST_SOURCES =
--RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-- html-recursive info-recursive install-data-recursive \
-- install-dvi-recursive install-exec-recursive \
-- install-html-recursive install-info-recursive \
-- install-pdf-recursive install-ps-recursive install-recursive \
-- installcheck-recursive installdirs-recursive pdf-recursive \
-- ps-recursive uninstall-recursive
-+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-+ ctags-recursive dvi-recursive html-recursive info-recursive \
-+ install-data-recursive install-dvi-recursive \
-+ install-exec-recursive install-html-recursive \
-+ install-info-recursive install-pdf-recursive \
-+ install-ps-recursive install-recursive installcheck-recursive \
-+ installdirs-recursive pdf-recursive ps-recursive \
-+ tags-recursive uninstall-recursive
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- DATA = $(sysconf_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
--AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-- distdir dist dist-all distcheck
-+am__recursive_targets = \
-+ $(RECURSIVE_TARGETS) \
-+ $(RECURSIVE_CLEAN_TARGETS) \
-+ $(am__extra_recursive_targets)
-+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-+ cscope distdir dist dist-all distcheck
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-+ $(LISP)config.h.in
-+# Read a list of newline-separated strings from the standard input,
-+# and print each of them once, without duplicates. Input order is
-+# *not* preserved.
-+am__uniquify_input = $(AWK) '\
-+ BEGIN { nonempty = 0; } \
-+ { items[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in items) print i; }; } \
-+'
-+# Make sure the list of sources is unique. This is necessary because,
-+# e.g., the same source file might be shared among _SOURCES variables
-+# for different programs/libraries.
-+am__define_uniq_tagged_files = \
-+ list='$(am__tagged_files)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
-+CSCOPE = cscope
- DIST_SUBDIRS = $(SUBDIRS)
-+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/adios.pc.in \
-+ $(srcdir)/adios_config.flags.in $(srcdir)/adios_config.in \
-+ $(srcdir)/config.h.in $(top_srcdir)/config/compile \
-+ $(top_srcdir)/config/config.guess \
-+ $(top_srcdir)/config/config.sub \
-+ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-+ $(top_srcdir)/config/missing \
-+ $(top_srcdir)/src/public/adios_version.h.in \
-+ $(top_srcdir)/utils/skel/lib/skel_have_adios_timing.py.in \
-+ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-+ config/compile config/config.guess config/config.sub \
-+ config/depcomp config/install-sh config/ltmain.sh \
-+ config/missing
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
- am__remove_distdir = \
-- { test ! -d "$(distdir)" \
-- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr "$(distdir)"; }; }
-+ if test -d "$(distdir)"; then \
-+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -rf "$(distdir)" \
-+ || { sleep 5 && rm -rf "$(distdir)"; }; \
-+ else :; fi
-+am__post_remove_distdir = $(am__remove_distdir)
- am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-@@ -172,7 +282,10 @@ am__relativize = \
- reldir="$$dir2"
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
-+DIST_TARGETS = dist-gzip
- distuninstallcheck_listfiles = find . -type f -print
-+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- ADIOSLIB_CFLAGS = @ADIOSLIB_CFLAGS@
-@@ -202,6 +315,7 @@ ALACRITY_CPPFLAGS = @ALACRITY_CPPFLAGS@
- ALACRITY_LDFLAGS = @ALACRITY_LDFLAGS@
- ALACRITY_LIBS = @ALACRITY_LIBS@
- AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- APLOD_CPPFLAGS = @APLOD_CPPFLAGS@
- APLOD_LDFLAGS = @APLOD_LDFLAGS@
- APLOD_LIBS = @APLOD_LIBS@
-@@ -242,6 +356,7 @@ DEPDIR = @DEPDIR@
- DIMES_CPPFLAGS = @DIMES_CPPFLAGS@
- DIMES_LDFLAGS = @DIMES_LDFLAGS@
- DIMES_LIBS = @DIMES_LIBS@
-+DLLTOOL = @DLLTOOL@
- DMALLOC_CPPFLAGS = @DMALLOC_CPPFLAGS@
- DMALLOC_LDFLAGS = @DMALLOC_LDFLAGS@
- DMALLOC_LIBS = @DMALLOC_LIBS@
-@@ -301,6 +416,7 @@ LUSTRE_LIBS = @LUSTRE_LIBS@
- MACRODEFFLAG = @MACRODEFFLAG@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MKDIR_P = @MKDIR_P@
- MPICC = @MPICC@
- MPICXX = @MPICXX@
-@@ -336,6 +452,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PAMI_CFLAGS = @PAMI_CFLAGS@
- PAMI_CPPFLAGS = @PAMI_CPPFLAGS@
-@@ -382,6 +499,7 @@ abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -416,7 +534,6 @@ libdir = @libdir@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -441,7 +558,8 @@ EXTRA_DIST = runconf \
- scripts/create.nssi.config.sh \
- scripts/kill.nssi.staging.sh \
- scripts/start.nssi.staging.sh \
-- scripts/FindADIOS.cmake
-+ scripts/FindADIOS.cmake \
-+ adios.pc
-
-
- # wrappers/matlab/Makefile \
-@@ -453,13 +571,13 @@ EXTRA_DIST = runconf \
- # wrappers/matlab/adiosopenc.c \
- # wrappers/matlab/adiosreadc.c
- bin_SCRIPTS = adios_config $(am__append_1)
--sysconf_DATA = scripts/FindADIOS.cmake
-+sysconf_DATA =
- CLEANFILES =
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
- .SUFFIXES:
--am--refresh:
-+am--refresh: Makefile
- @:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
-@@ -474,7 +592,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+--- adios-1.10.1.orig/Makefile.in
++++ adios-1.10.1/Makefile.in
+@@ -605,7 +605,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
@@ -410,443 +94,15 @@ Index: adios-1.9.0/Makefile.in
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
-@@ -495,10 +612,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
- $(am__aclocal_m4_deps):
-
- config.h: stamp-h1
-- @if test ! -f $@; then \
-- rm -f stamp-h1; \
-- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-- else :; fi
-+ @test -f $@ || rm -f stamp-h1
-+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
-@@ -516,12 +631,17 @@ adios_config: $(top_builddir)/config.sta
- cd $(top_builddir) && $(SHELL) ./config.status $@
- adios_config.flags: $(top_builddir)/config.status $(srcdir)/adios_config.flags.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-+adios.pc: $(top_builddir)/config.status $(srcdir)/adios.pc.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
- src/public/adios_version.h: $(top_builddir)/config.status $(top_srcdir)/src/public/adios_version.h.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
-- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-+ if test -n "$$list"; then \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-+ fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-@@ -549,9 +669,7 @@ uninstall-binSCRIPTS:
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
-- test -n "$$list" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(bindir)" && rm -f $$files
-+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -563,8 +681,11 @@ distclean-libtool:
- -rm -f libtool config.lt
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+ if test -n "$$list"; then \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
-+ fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
-@@ -578,27 +699,28 @@ uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-- test -n "$$files" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
-+ dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
-
- # This directory's subdirectories are mostly independent; you can cd
--# into them and run `make' without going through this Makefile.
--# To change the values of `make' variables: instead of editing Makefiles,
--# (1) if the variable is set in `config.status', edit `config.status'
--# (which will cause the Makefiles to be regenerated when you run `make');
--# (2) otherwise, pass the desired values on the `make' command line.
--$(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+# into them and run 'make' without going through this Makefile.
-+# To change the values of 'make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in 'config.status', edit 'config.status'
-+# (which will cause the Makefiles to be regenerated when you run 'make');
-+# (2) otherwise, pass the desired values on the 'make' command line.
-+$(am__recursive_targets):
-+ @fail=; \
-+ if $(am__make_keepgoing); then \
-+ failcom='fail=yes'; \
-+ else \
-+ failcom='exit 1'; \
-+ fi; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ case "$@" in \
-+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+ *) list='$(SUBDIRS)' ;; \
-+ esac; \
-+ for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
-@@ -613,57 +735,12 @@ $(RECURSIVE_TARGETS):
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--$(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-- dot_seen=no; \
-- case "$@" in \
-- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-- *) list='$(SUBDIRS)' ;; \
-- esac; \
-- rev=''; for subdir in $$list; do \
-- if test "$$subdir" = "."; then :; else \
-- rev="$$subdir $$rev"; \
-- fi; \
-- done; \
-- rev="$$rev ."; \
-- target=`echo $@ | sed s/-recursive//`; \
-- for subdir in $$rev; do \
-- echo "Making $$target in $$subdir"; \
-- if test "$$subdir" = "."; then \
-- local_target="$$target-am"; \
-- else \
-- local_target="$$target"; \
-- fi; \
-- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-- done && test -z "$$fail"
--tags-recursive:
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-- done
--ctags-recursive:
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-- done
-+ID: $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); mkid -fID $$unique
-+tags: tags-recursive
-+TAGS: tags
-
--ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-- unique=`for i in $$list; do \
-- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- mkid -fID $$unique
--tags: TAGS
--
--TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-- $(TAGS_FILES) $(LISP)
-+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-@@ -679,12 +756,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-- unique=`for i in $$list; do \
-- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-- END { if (nonempty) { for (i in files) print i; }; }'`; \
-+ $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-@@ -696,15 +768,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- $$unique; \
- fi; \
- fi
--ctags: CTAGS
--CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-- $(TAGS_FILES) $(LISP)
-- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-- unique=`for i in $$list; do \
-- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-- END { if (nonempty) { for (i in files) print i; }; }'`; \
-+ctags: ctags-recursive
-+
-+CTAGS: ctags
-+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-@@ -713,9 +781,31 @@ GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-+cscope: cscope.files
-+ test ! -s cscope.files \
-+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-+clean-cscope:
-+ -rm -f cscope.files
-+cscope.files: clean-cscope cscopelist
-+cscopelist: cscopelist-recursive
-+
-+cscopelist-am: $(am__tagged_files)
-+ list='$(am__tagged_files)'; \
-+ case "$(srcdir)" in \
-+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-+ *) sdir=$(subdir)/$(srcdir) ;; \
-+ esac; \
-+ for i in $$list; do \
-+ if test -f "$$i"; then \
-+ echo "$(subdir)/$$i"; \
-+ else \
-+ echo "$$sdir/$$i"; \
-+ fi; \
-+ done >> $(top_builddir)/cscope.files
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
-@@ -751,13 +841,10 @@ distdir: $(DISTFILES)
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d "$(distdir)/$$subdir" \
-- || $(MKDIR_P) "$(distdir)/$$subdir" \
-- || exit 1; \
-- fi; \
-- done
-- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-- if test "$$subdir" = .; then :; else \
-+ $(am__make_dryrun) \
-+ || test -d "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
-+ || exit 1; \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
-@@ -786,36 +873,42 @@ distdir: $(DISTFILES)
- || chmod -R a+r "$(distdir)"
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-- $(am__remove_distdir)
-+ $(am__post_remove_distdir)
-
- dist-bzip2: distdir
-- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-- $(am__remove_distdir)
-+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-+ $(am__post_remove_distdir)
-
--dist-lzma: distdir
-- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-- $(am__remove_distdir)
-+dist-lzip: distdir
-+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-+ $(am__post_remove_distdir)
-
- dist-xz: distdir
-- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-- $(am__remove_distdir)
-+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-+ $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-- $(am__remove_distdir)
-+ $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-- $(am__remove_distdir)
-+ $(am__post_remove_distdir)
-
- dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
-- $(am__remove_distdir)
-+ $(am__post_remove_distdir)
-
--dist dist-all: distdir
-- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-- $(am__remove_distdir)
-+dist dist-all:
-+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-+ $(am__post_remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
- # it guarantees that the distribution is self-contained by making another
-@@ -826,8 +919,8 @@ distcheck: dist
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-- *.tar.lzma*) \
-- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+ *.tar.lz*) \
-+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
-@@ -837,17 +930,19 @@ distcheck: dist
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-- chmod -R a-w $(distdir); chmod u+w $(distdir)
-- mkdir $(distdir)/_build
-- mkdir $(distdir)/_inst
-+ chmod -R a-w $(distdir)
-+ chmod u+w $(distdir)
-+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
- chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
-- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && $(am__cd) $(distdir)/_build/sub \
-+ && ../../configure \
-+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-@@ -870,13 +965,21 @@ distcheck: dist
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- && cd "$$am__cwd" \
- || exit 1
-- $(am__remove_distdir)
-+ $(am__post_remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
-- @$(am__cd) '$(distuninstallcheck_dir)' \
-- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+ @test -n '$(distuninstallcheck_dir)' || { \
-+ echo 'ERROR: trying to run $@ with an empty' \
-+ '$$(distuninstallcheck_dir)' >&2; \
-+ exit 1; \
-+ }; \
-+ $(am__cd) '$(distuninstallcheck_dir)' || { \
-+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-+ exit 1; \
-+ }; \
-+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
-@@ -910,10 +1013,15 @@ install-am: all-am
-
- installcheck: installcheck-recursive
- install-strip:
-- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-- `test -z '$(STRIP)' || \
-- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+ if test -z '$(STRIP)'; then \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ install; \
-+ else \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+ fi
- mostlyclean-generic:
-
- clean-generic:
-@@ -997,18 +1105,17 @@ ps-am:
-
- uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-- ctags-recursive install-am install-data-am install-strip \
-- tags-recursive
--
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-- all all-am am--refresh check check-am clean clean-generic \
-- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-- distcheck distclean distclean-generic distclean-hdr \
-- distclean-libtool distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-binSCRIPTS install-data \
-+.MAKE: $(am__recursive_targets) all install-am install-data-am \
-+ install-strip
-+
-+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-+ am--refresh check check-am clean clean-cscope clean-generic \
-+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
-+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-+ dist-xz dist-zip distcheck distclean distclean-generic \
-+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
-+ distdir distuninstallcheck dvi dvi-am html html-am info \
-+ info-am install install-am install-binSCRIPTS install-data \
- install-data-am install-data-hook install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
-@@ -1016,9 +1123,11 @@ uninstall-am: uninstall-binSCRIPTS unins
- install-sysconfDATA installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am tags tags-recursive uninstall uninstall-am \
-+ ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binSCRIPTS uninstall-sysconfDATA
-
-+.PRECIOUS: Makefile
-+
+Index: adios-1.10.1/configure.ac
+===================================================================
+--- adios-1.10.1.orig/configure.ac
++++ adios-1.10.1/configure.ac
+@@ -901,6 +901,7 @@ AC_CONFIG_FILES([Makefile
+ adios_config.flags.makesrc
+ adios_config.makesrc
+ src/public/adios_version.h
++ adios.pc
+ ])
- #install-data-hook:
- # echo -n "VERSIONSTRING=\"$(PACKAGE) version $(VERSION) svn revision " >> adios_config.flags
-@@ -1042,8 +1151,6 @@ install-data-hook:
- echo "GITSTAT=\"git status not available\"" >> adios_git_status; \
- echo "Note: git command not found or $(PWD) is not a git repository."; \
- fi
-- $(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
-- $(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/patches/python_wrapper.patch b/debian/patches/python_wrapper.patch
index 442abce..e7caa6e 100644
--- a/debian/patches/python_wrapper.patch
+++ b/debian/patches/python_wrapper.patch
@@ -3,26 +3,25 @@ Description: Use adios_config in place during build and install
Last-Updated: 2015-05-20
Forwarded: not-needed
-Index: adios-1.9.0/Makefile.am
+Index: adios-1.10.1/Makefile.am
===================================================================
---- adios-1.9.0.orig/Makefile.am
-+++ adios-1.9.0/Makefile.am
-@@ -53,7 +53,7 @@ install-data-hook:
- echo "GITSTAT=\"git status not available\"" >> adios_git_status; \
+--- adios-1.10.1.orig/Makefile.am
++++ adios-1.10.1/Makefile.am
+@@ -60,8 +60,6 @@ install-data-hook:
+ echo "GITSTAT=\"git status not available\"" >> $(abs_top_builddir)/adios_git_status; \
echo "Note: git command not found or $(PWD) is not a git repository."; \
- fi
+ fi)
- $(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
- $(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
-+ #$(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
-+ #$(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
-
- CLEANFILES =
-Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
+
+ CLEANFILES = adios_config adios_config.flags adios_config.makesrc adios_config.flags.makesrc
+
+Index: adios-1.10.1/wrappers/numpy/setup_mpi.py
===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.9.0/wrappers/numpy/setup_mpi.py
-@@ -27,8 +27,8 @@ def _do_usage():
- sys.exit(0)
+--- adios-1.10.1.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.10.1/wrappers/numpy/setup_mpi.py
+@@ -27,8 +27,8 @@ import argparse
+ # sys.exit(0)
# Default option values
-include_dirs = [np.get_include(), '../../src/public'],
@@ -32,12 +31,12 @@ Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
extra_compile_args = []
extra_link_args = []
-Index: adios-1.9.0/wrappers/numpy/setup.py
+Index: adios-1.10.1/wrappers/numpy/setup.py
===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup.py
-+++ adios-1.9.0/wrappers/numpy/setup.py
-@@ -18,7 +18,7 @@ m1 = Extension('adios',
- sources=['adios.cpp'],
+--- adios-1.10.1.orig/wrappers/numpy/setup.py
++++ adios-1.10.1/wrappers/numpy/setup.py
+@@ -19,7 +19,7 @@ m1 = Extension('adios.adios',
+ sources=['adios.cpp'],
define_macros=[('_NOMPI', None)],
include_dirs = [np.get_include(), '../../src/public'],
- library_dirs = [],
diff --git a/debian/patches/security.patch b/debian/patches/security.patch
deleted file mode 100644
index 5699f06..0000000
--- a/debian/patches/security.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Silence spurious warnings when building with security flags
-Last-Updated: 2015-05-11
-Forwarded: no
-
diff --git a/debian/patches/series b/debian/patches/series
index ab7fc5f..01cd2d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ numpy_paths.patch
# deprecate_numpy17.patch
exclude_cmake.patch
python_wrapper.patch
-autotools-fixes.patch
multiarch_safe.patch
py3.patch
version-fix.patch
diff --git a/debian/patches/sh4.patch b/debian/patches/sh4.patch
deleted file mode 100644
index 69104ca..0000000
--- a/debian/patches/sh4.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Support for SH-4 Architecture
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635908
-Bug-Debian: http://bugs.debian.org/635908
-Forwarded: not-needed
-Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Last-Updated: 2011-08-09
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list