[adios] 26/207: fix patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 3137976c296ee9cb904f2cc7ff13d49de07f0a8b
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Aug 15 17:04:18 2011 +0100
fix patch
---
debian/patches/nompi_flag.patch | 614 ++--------------------------------------
1 file changed, 18 insertions(+), 596 deletions(-)
diff --git a/debian/patches/nompi_flag.patch b/debian/patches/nompi_flag.patch
index 11996fe..49ce7bc 100644
--- a/debian/patches/nompi_flag.patch
+++ b/debian/patches/nompi_flag.patch
@@ -5,605 +5,27 @@ Forwarded: no
Index: adios-1.3/utils/bp2h5/Makefile.am
===================================================================
---- adios-1.3.orig/utils/bp2h5/Makefile.am 2011-08-15 16:40:38.000000000 +0100
-+++ adios-1.3/utils/bp2h5/Makefile.am 2011-08-15 16:50:21.000000000 +0100
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = bp2h5
+--- adios-1.3.orig/utils/bp2h5/Makefile.am 2011-08-15 17:02:37.000000000 +0100
++++ adios-1.3/utils/bp2h5/Makefile.am 2011-08-15 17:02:51.000000000 +0100
+@@ -7,7 +7,7 @@
bp2h5_SOURCES = bp2h5.c
--bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSREADLIB_SEQ_CPPFLAGS) $(ADIOSREADLIB_SEQ_CFLAGS ) $(HDF5_CPPFLAGS)
-+bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSREADLIB_INT_CFLAGS) $(HDF5_CPPFLAGS)
- bp2h5_LDFLAGS = $(ADIOSREADLIB_SEQ_LDFLAGS) $(HDF5_LDFLAGS)
+ bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSREADLIB_INT_CFLAGS) $(HDF5_CPPFLAGS)
+-bp2h5_LDFLAGS = $(ADIOSREADLIB_SEQ_LDFLAGS) $(HDF5_LDFLAGS)
++bp2h5_LDFLAGS = $(ADIOSREADLIB_INT_LDFLAGS) $(HDF5_LDFLAGS)
bp2h5_LDADD = $(top_builddir)/src/libadiosread_nompi.a
+ bp2h5_LDADD += $(ADIOSREADLIB_SEQ_LDADD)
Index: adios-1.3/utils/bp2h5/Makefile.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ adios-1.3/utils/bp2h5/Makefile.in 2011-08-15 16:50:58.000000000 +0100
-@@ -0,0 +1,586 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+bin_PROGRAMS = bp2h5$(EXEEXT)
-+subdir = utils/bp2h5
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/config/ac_dart.m4 \
-+ $(top_srcdir)/config/ac_datatap.m4 \
-+ $(top_srcdir)/config/ac_dimes.m4 \
-+ $(top_srcdir)/config/ac_dmalloc.m4 \
-+ $(top_srcdir)/config/ac_hdf5.m4 \
-+ $(top_srcdir)/config/ac_infiniband.m4 \
-+ $(top_srcdir)/config/ac_lustre.m4 \
-+ $(top_srcdir)/config/ac_mxml.m4 \
-+ $(top_srcdir)/config/ac_nc4par.m4 \
-+ $(top_srcdir)/config/ac_netcdf.m4 \
-+ $(top_srcdir)/config/ac_nssi.m4 \
-+ $(top_srcdir)/config/ac_pablo.m4 \
-+ $(top_srcdir)/config/ac_phdf5.m4 \
-+ $(top_srcdir)/config/ac_portals.m4 \
-+ $(top_srcdir)/config/acx_mpi.m4 \
-+ $(top_srcdir)/config/acx_pthread.m4 \
-+ $(top_srcdir)/config/cercs.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_bp2h5_OBJECTS = bp2h5-bp2h5.$(OBJEXT)
-+bp2h5_OBJECTS = $(am_bp2h5_OBJECTS)
-+am__DEPENDENCIES_1 =
-+bp2h5_DEPENDENCIES = $(top_builddir)/src/libadiosread_nompi.a \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp =
-+am__depfiles_maybe =
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(bp2h5_SOURCES)
-+DIST_SOURCES = $(bp2h5_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ADIOSLIB_CFLAGS = @ADIOSLIB_CFLAGS@
-+ADIOSLIB_CPPFLAGS = @ADIOSLIB_CPPFLAGS@
-+ADIOSLIB_EXTRA_CPPFLAGS = @ADIOSLIB_EXTRA_CPPFLAGS@
-+ADIOSLIB_INT_CFLAGS = @ADIOSLIB_INT_CFLAGS@
-+ADIOSLIB_INT_CPPFLAGS = @ADIOSLIB_INT_CPPFLAGS@
-+ADIOSLIB_INT_LDADD = @ADIOSLIB_INT_LDADD@
-+ADIOSLIB_INT_LDFLAGS = @ADIOSLIB_INT_LDFLAGS@
-+ADIOSLIB_LDADD = @ADIOSLIB_LDADD@
-+ADIOSLIB_LDFLAGS = @ADIOSLIB_LDFLAGS@
-+ADIOSLIB_SEQ_CFLAGS = @ADIOSLIB_SEQ_CFLAGS@
-+ADIOSLIB_SEQ_CPPFLAGS = @ADIOSLIB_SEQ_CPPFLAGS@
-+ADIOSLIB_SEQ_LDADD = @ADIOSLIB_SEQ_LDADD@
-+ADIOSLIB_SEQ_LDFLAGS = @ADIOSLIB_SEQ_LDFLAGS@
-+ADIOSREADLIB_CFLAGS = @ADIOSREADLIB_CFLAGS@
-+ADIOSREADLIB_CPPFLAGS = @ADIOSREADLIB_CPPFLAGS@
-+ADIOSREADLIB_LDADD = @ADIOSREADLIB_LDADD@
-+ADIOSREADLIB_LDFLAGS = @ADIOSREADLIB_LDFLAGS@
-+ADIOSREADLIB_SEQ_CFLAGS = @ADIOSREADLIB_SEQ_CFLAGS@
-+ADIOSREADLIB_SEQ_CPPFLAGS = @ADIOSREADLIB_SEQ_CPPFLAGS@
-+ADIOSREADLIB_SEQ_LDADD = @ADIOSREADLIB_SEQ_LDADD@
-+ADIOSREADLIB_SEQ_LDFLAGS = @ADIOSREADLIB_SEQ_LDFLAGS@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_FORTRAN_FALSE = @BUILD_FORTRAN_FALSE@
-+BUILD_FORTRAN_TRUE = @BUILD_FORTRAN_TRUE@
-+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
-+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CSH = @CSH@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DART_CPPFLAGS = @DART_CPPFLAGS@
-+DART_LDFLAGS = @DART_LDFLAGS@
-+DART_LIBS = @DART_LIBS@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DIMES_CPPFLAGS = @DIMES_CPPFLAGS@
-+DIMES_LDFLAGS = @DIMES_LDFLAGS@
-+DIMES_LIBS = @DIMES_LIBS@
-+DMALLOC_CPPFLAGS = @DMALLOC_CPPFLAGS@
-+DMALLOC_LDFLAGS = @DMALLOC_LDFLAGS@
-+DMALLOC_LIBS = @DMALLOC_LIBS@
-+DT_CPPFLAGS = @DT_CPPFLAGS@
-+DT_LDFLAGS = @DT_LDFLAGS@
-+DT_LIBS = @DT_LIBS@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FC = @FC@
-+FCFLAGS = @FCFLAGS@
-+FCLIBS = @FCLIBS@
-+FFLAGS = @FFLAGS@
-+HAVE_DART_FALSE = @HAVE_DART_FALSE@
-+HAVE_DART_TRUE = @HAVE_DART_TRUE@
-+HAVE_DATATAP_FALSE = @HAVE_DATATAP_FALSE@
-+HAVE_DATATAP_TRUE = @HAVE_DATATAP_TRUE@
-+HAVE_DIMES_FALSE = @HAVE_DIMES_FALSE@
-+HAVE_DIMES_TRUE = @HAVE_DIMES_TRUE@
-+HAVE_DMALLOC_FALSE = @HAVE_DMALLOC_FALSE@
-+HAVE_DMALLOC_TRUE = @HAVE_DMALLOC_TRUE@
-+HAVE_HDF5_FALSE = @HAVE_HDF5_FALSE@
-+HAVE_HDF5_TRUE = @HAVE_HDF5_TRUE@
-+HAVE_INFINIBAND_FALSE = @HAVE_INFINIBAND_FALSE@
-+HAVE_INFINIBAND_TRUE = @HAVE_INFINIBAND_TRUE@
-+HAVE_LUSTRE_FALSE = @HAVE_LUSTRE_FALSE@
-+HAVE_LUSTRE_TRUE = @HAVE_LUSTRE_TRUE@
-+HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
-+HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
-+HAVE_MXML_FALSE = @HAVE_MXML_FALSE@
-+HAVE_MXML_TRUE = @HAVE_MXML_TRUE@
-+HAVE_NC4PAR_FALSE = @HAVE_NC4PAR_FALSE@
-+HAVE_NC4PAR_TRUE = @HAVE_NC4PAR_TRUE@
-+HAVE_NETCDF_FALSE = @HAVE_NETCDF_FALSE@
-+HAVE_NETCDF_TRUE = @HAVE_NETCDF_TRUE@
-+HAVE_NSSI_FALSE = @HAVE_NSSI_FALSE@
-+HAVE_NSSI_TRUE = @HAVE_NSSI_TRUE@
-+HAVE_PABLO_FALSE = @HAVE_PABLO_FALSE@
-+HAVE_PABLO_TRUE = @HAVE_PABLO_TRUE@
-+HAVE_PHDF5_FALSE = @HAVE_PHDF5_FALSE@
-+HAVE_PHDF5_TRUE = @HAVE_PHDF5_TRUE@
-+HAVE_PORTALS_FALSE = @HAVE_PORTALS_FALSE@
-+HAVE_PORTALS_TRUE = @HAVE_PORTALS_TRUE@
-+HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
-+HDF5_LDFLAGS = @HDF5_LDFLAGS@
-+HDF5_LIBS = @HDF5_LIBS@
-+INFINIBAND_CFLAGS = @INFINIBAND_CFLAGS@
-+INFINIBAND_CPPFLAGS = @INFINIBAND_CPPFLAGS@
-+INFINIBAND_HEADER = @INFINIBAND_HEADER@
-+INFINIBAND_LDFLAGS = @INFINIBAND_LDFLAGS@
-+INFINIBAND_LIBS = @INFINIBAND_LIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+LUSTRE_CPPFLAGS = @LUSTRE_CPPFLAGS@
-+LUSTRE_LDFLAGS = @LUSTRE_LDFLAGS@
-+LUSTRE_LIBS = @LUSTRE_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MPICC = @MPICC@
-+MPICXX = @MPICXX@
-+MPIFC = @MPIFC@
-+MPILIBS = @MPILIBS@
-+MXML_CPPFLAGS = @MXML_CPPFLAGS@
-+MXML_LDFLAGS = @MXML_LDFLAGS@
-+MXML_LIBS = @MXML_LIBS@
-+NC4PAR_CPPFLAGS = @NC4PAR_CPPFLAGS@
-+NC4PAR_LDFLAGS = @NC4PAR_LDFLAGS@
-+NC4PAR_LIBS = @NC4PAR_LIBS@
-+NEED_DARWIN_SINGLE_MODULE_FALSE = @NEED_DARWIN_SINGLE_MODULE_FALSE@
-+NEED_DARWIN_SINGLE_MODULE_TRUE = @NEED_DARWIN_SINGLE_MODULE_TRUE@
-+NETCDF_CPPFLAGS = @NETCDF_CPPFLAGS@
-+NETCDF_LDFLAGS = @NETCDF_LDFLAGS@
-+NETCDF_LIBS = @NETCDF_LIBS@
-+NSSI_BUILDDIR = @NSSI_BUILDDIR@
-+NSSI_CFLAGS = @NSSI_CFLAGS@
-+NSSI_CPPFLAGS = @NSSI_CPPFLAGS@
-+NSSI_LDFLAGS = @NSSI_LDFLAGS@
-+NSSI_LIBS = @NSSI_LIBS@
-+NSSI_SERVER_LIBS = @NSSI_SERVER_LIBS@
-+NSSI_SRCDIR = @NSSI_SRCDIR@
-+OBJEXT = @OBJEXT@
-+PABLO_CPPFLAGS = @PABLO_CPPFLAGS@
-+PABLO_LDFLAGS = @PABLO_LDFLAGS@
-+PABLO_LIBS = @PABLO_LIBS@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATHPROG = @PATHPROG@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PHDF5_CPPFLAGS = @PHDF5_CPPFLAGS@
-+PHDF5_LDFLAGS = @PHDF5_LDFLAGS@
-+PHDF5_LIBS = @PHDF5_LIBS@
-+PORTALS_CFLAGS = @PORTALS_CFLAGS@
-+PORTALS_CPPFLAGS = @PORTALS_CPPFLAGS@
-+PORTALS_HEADER = @PORTALS_HEADER@
-+PORTALS_LDFLAGS = @PORTALS_LDFLAGS@
-+PORTALS_LIBS = @PORTALS_LIBS@
-+PORTALS_NAL_HEADER = @PORTALS_NAL_HEADER@
-+PORTALS_RT_HEADER = @PORTALS_RT_HEADER@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+RANLIB = @RANLIB@
-+RESEARCH_TRANSPORTS_FALSE = @RESEARCH_TRANSPORTS_FALSE@
-+RESEARCH_TRANSPORTS_TRUE = @RESEARCH_TRANSPORTS_TRUE@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+USE_PARALLEL_COMPILER_FALSE = @USE_PARALLEL_COMPILER_FALSE@
-+USE_PARALLEL_COMPILER_TRUE = @USE_PARALLEL_COMPILER_TRUE@
-+VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_FC = @ac_ct_FC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+INCLUDES = $(all_includes) -I$(top_builddir)/src
-+AUTOMAKE_OPTIONS = no-dependencies
-+bp2h5_SOURCES = bp2h5.c
-+bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(HDF5_CPPFLAGS)
-+bp2h5_LDFLAGS = $(HDF5_LDFLAGS)
-+bp2h5_LDADD = $(top_builddir)/src/libadiosread_nompi.a \
-+ $(ADIOSREADLIB_INT_LDADD) $(HDF5_LIBS)
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/bp2h5/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu utils/bp2h5/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ if test -f $$p \
-+ || test -f $$p1 \
-+ ; then \
-+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ else :; fi; \
-+ done
-+
-+uninstall-binPROGRAMS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+ done
-+
-+clean-binPROGRAMS:
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f $$p $$f"; \
-+ rm -f $$p $$f ; \
-+ done
-+bp2h5$(EXEEXT): $(bp2h5_OBJECTS) $(bp2h5_DEPENDENCIES)
-+ @rm -f bp2h5$(EXEEXT)
-+ $(LINK) $(bp2h5_LDFLAGS) $(bp2h5_OBJECTS) $(bp2h5_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+.c.o:
-+ $(COMPILE) -c $<
-+
-+.c.obj:
-+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+ $(LTCOMPILE) -c -o $@ $<
-+
-+bp2h5-bp2h5.o: bp2h5.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bp2h5_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bp2h5-bp2h5.o `test -f 'bp2h5.c' || echo '$(srcdir)/'`bp2h5.c
-+
-+bp2h5-bp2h5.obj: bp2h5.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bp2h5_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bp2h5-bp2h5.obj `if test -f 'bp2h5.c'; then $(CYGPATH_W) 'bp2h5.c'; else $(CYGPATH_W) '$(srcdir)/bp2h5.c'; fi`
-+
-+mostlyclean-libtool:
-+ -rm -f *.lo
-+
-+clean-libtool:
-+ -rm -rf .libs _libs
-+
-+distclean-libtool:
-+ -rm -f libtool
-+uninstall-info-am:
-+
-+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; } \
-+ END { for (i in files) print i; }'`; \
-+ mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ 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; } \
-+ END { for (i in files) print i; }'`; \
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
-+ctags: CTAGS
-+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ 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; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$tags $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ fi; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
-+ done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(PROGRAMS)
-+installdirs:
-+ for dir in "$(DESTDIR)$(bindir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+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
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+ -rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+ distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+ clean-generic clean-libtool ctags distclean distclean-compile \
-+ distclean-generic distclean-libtool distclean-tags distdir dvi \
-+ dvi-am html html-am info info-am install install-am \
-+ install-binPROGRAMS install-data install-data-am install-exec \
-+ install-exec-am install-info install-info-am install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-binPROGRAMS uninstall-info-am
-+
-+
-+#CC=$(MPICC)
-+#CXX=$(MPICXX)
-+# 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.
-+.NOEXPORT:
+--- adios-1.3.orig/utils/bp2h5/Makefile.in 2011-08-15 17:02:59.000000000 +0100
++++ adios-1.3/utils/bp2h5/Makefile.in 2011-08-15 17:03:36.000000000 +0100
+@@ -312,7 +312,7 @@
+ INCLUDES = $(all_includes) -I$(top_builddir)/src
+ AUTOMAKE_OPTIONS = no-dependencies
+ bp2h5_SOURCES = bp2h5.c
+-bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSREADLIB_SEQ_CPPFLAGS) $(ADIOSREADLIB_SEQ_CFLAGS ) $(HDF5_CPPFLAGS)
++bp2h5_CPPFLAGS = -DH5_USE_16_API $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSREADLIB_INT_CPPFLAGS) $(HDF5_CPPFLAGS)
+ bp2h5_LDFLAGS = $(ADIOSREADLIB_SEQ_LDFLAGS) $(HDF5_LDFLAGS)
+ bp2h5_LDADD = $(top_builddir)/src/libadiosread_nompi.a \
+ $(ADIOSREADLIB_SEQ_LDADD) $(HDF5_LIBS)
--
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