[adios] 08/10: #789464: Make examples multiarch safe
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 7 12:20:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository adios.
commit a6bf61cd42a5e66142eeddba51848afd48b300da
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 1 16:24:15 2015 +0100
#789464: Make examples multiarch safe
---
debian/patches/multiarch_safe.patch | 775 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 776 insertions(+)
diff --git a/debian/patches/multiarch_safe.patch b/debian/patches/multiarch_safe.patch
new file mode 100644
index 0000000..35f4b76
--- /dev/null
+++ b/debian/patches/multiarch_safe.patch
@@ -0,0 +1,775 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789464
+Description: Make example files multi-arch safe by extracting @host@, @build@
+ at runtime, not at autoconf time.
+Last-Updated: 2015-07-02
+Forwarded: not-needed
+
+diff -urN examples.orig/C/arrays/Makefile.in examples/C/arrays/Makefile.in
+--- examples.orig/C/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/arrays/Makefile.in 2015-07-01 16:12:02.074948284 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
+ subdir = examples/C/arrays
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/attributes/Makefile.in examples/C/attributes/Makefile.in
+--- examples.orig/C/attributes/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/attributes/Makefile.in 2015-07-01 16:12:02.102949089 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = attributes_write$(EXEEXT) attributes_read$(EXEEXT)
+ subdir = examples/C/attributes
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/flexpath_arrays/global_range_select/Makefile.in examples/C/flexpath_arrays/global_range_select/Makefile.in
+--- examples.orig/C/flexpath_arrays/global_range_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/flexpath_arrays/global_range_select/Makefile.in 2015-07-01 16:12:02.178951273 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
+ subdir = examples/C/flexpath_arrays/global_range_select
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/flexpath_arrays/Makefile.in examples/C/flexpath_arrays/Makefile.in
+--- examples.orig/C/flexpath_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/flexpath_arrays/Makefile.in 2015-07-01 16:12:02.166950928 +0100
+@@ -31,8 +31,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ subdir = examples/C/flexpath_arrays
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -338,7 +338,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -349,7 +349,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/flexpath_arrays/process_select/Makefile.in examples/C/flexpath_arrays/process_select/Makefile.in
+--- examples.orig/C/flexpath_arrays/process_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/flexpath_arrays/process_select/Makefile.in 2015-07-01 16:12:02.170951043 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
+ subdir = examples/C/flexpath_arrays/process_select
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/global-array/Makefile.in examples/C/global-array/Makefile.in
+--- examples.orig/C/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/global-array/Makefile.in 2015-07-01 16:12:02.142950238 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_global$(EXEEXT) adios_global_2files$(EXEEXT) \
+ adios_read_gpp$(EXEEXT) adios_read_global$(EXEEXT) \
+ adios_read_writeblock$(EXEEXT) adios_read_chunk$(EXEEXT) \
+@@ -415,7 +415,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -426,7 +426,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/global-array-time/Makefile.in examples/C/global-array-time/Makefile.in
+--- examples.orig/C/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/global-array-time/Makefile.in 2015-07-01 16:12:02.118949549 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_globaltime$(EXEEXT) \
+ adios_globaltime_no_xml$(EXEEXT) \
+ adios_read_globaltime$(EXEEXT) \
+@@ -358,7 +358,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -369,7 +369,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/icee_arrays/array/Makefile.in examples/C/icee_arrays/array/Makefile.in
+--- examples.orig/C/icee_arrays/array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/icee_arrays/array/Makefile.in 2015-07-01 16:12:02.138950123 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_write$(EXEEXT) adios_read$(EXEEXT)
+ subdir = examples/C/icee_arrays/array
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/icee_arrays/Makefile.in examples/C/icee_arrays/Makefile.in
+--- examples.orig/C/icee_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/icee_arrays/Makefile.in 2015-07-01 16:12:02.130949893 +0100
+@@ -31,8 +31,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ subdir = examples/C/icee_arrays
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -338,7 +338,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -349,7 +349,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/Makefile.in examples/C/Makefile.in
+--- examples.orig/C/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/Makefile.in 2015-07-01 16:12:02.066948054 +0100
+@@ -31,8 +31,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ subdir = examples/C
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -338,7 +338,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -349,7 +349,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/manual/Makefile.in examples/C/manual/Makefile.in
+--- examples.orig/C/manual/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/manual/Makefile.in 2015-07-01 16:12:02.114949434 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = 1_nonadios_example$(EXEEXT) 2_adios_write$(EXEEXT) \
+ 3_adios_read$(EXEEXT) 4_adios_nfiles$(EXEEXT)
+ subdir = examples/C/manual
+@@ -347,7 +347,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -358,7 +358,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/query/Makefile.in examples/C/query/Makefile.in
+--- examples.orig/C/query/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/query/Makefile.in 2015-07-01 16:12:02.150950468 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = write_vars$(EXEEXT) query_vars$(EXEEXT) \
+ write_table$(EXEEXT) query_table$(EXEEXT)
+ subdir = examples/C/query
+@@ -347,7 +347,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -358,7 +358,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/read_all/Makefile.in examples/C/read_all/Makefile.in
+--- examples.orig/C/read_all/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/read_all/Makefile.in 2015-07-01 16:12:02.094948859 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = read_all$(EXEEXT) read_all_v1$(EXEEXT)
+ subdir = examples/C/read_all
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/scalars/Makefile.in examples/C/scalars/Makefile.in
+--- examples.orig/C/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/scalars/Makefile.in 2015-07-01 16:12:02.122949664 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = scalars_write$(EXEEXT) scalars_read$(EXEEXT) \
+ scalars_write_step$(EXEEXT)
+ subdir = examples/C/scalars
+@@ -340,7 +340,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -351,7 +351,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/schema/Makefile.in examples/C/schema/Makefile.in
+--- examples.orig/C/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/schema/Makefile.in 2015-07-01 16:12:02.082948514 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = uniform2d$(EXEEXT) rectilinear2d$(EXEEXT) \
+ structured2d$(EXEEXT) tri2d$(EXEEXT) triangle2d$(EXEEXT) \
+ uniform2d_noxml$(EXEEXT) rectilinear2d_noxml$(EXEEXT) \
+@@ -388,7 +388,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -399,7 +399,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/stat/Makefile.in examples/C/stat/Makefile.in
+--- examples.orig/C/stat/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/stat/Makefile.in 2015-07-01 16:12:02.086948629 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = stat_write$(EXEEXT) stat_read$(EXEEXT)
+ subdir = examples/C/stat
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -330,7 +330,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -341,7 +341,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/C/transforms/Makefile.in examples/C/transforms/Makefile.in
+--- examples.orig/C/transforms/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/C/transforms/Makefile.in 2015-07-01 16:12:02.158950698 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_global$(EXEEXT) adios_read_subv$(EXEEXT) \
+ adios_read_points$(EXEEXT) adios_read_wb_subpg$(EXEEXT)
+ subdir = examples/C/transforms
+@@ -347,7 +347,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -358,7 +358,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/arrays/Makefile.in examples/Fortran/arrays/Makefile.in
+--- examples.orig/Fortran/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/arrays/Makefile.in 2015-07-01 16:12:02.190951618 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
+ subdir = examples/Fortran/arrays
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -327,7 +327,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -338,7 +338,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/global-array/Makefile.in examples/Fortran/global-array/Makefile.in
+--- examples.orig/Fortran/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/global-array/Makefile.in 2015-07-01 16:12:02.218952422 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_global$(EXEEXT) adios_global_no_xml$(EXEEXT) \
+ no_xml_write_byid$(EXEEXT)
+ subdir = examples/Fortran/global-array
+@@ -337,7 +337,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -348,7 +348,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/global-array-time/Makefile.in examples/Fortran/global-array-time/Makefile.in
+--- examples.orig/Fortran/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/global-array-time/Makefile.in 2015-07-01 16:12:02.206952077 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = adios_globaltime$(EXEEXT)
+ subdir = examples/Fortran/global-array-time
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -320,7 +320,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -331,7 +331,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/Makefile.in examples/Fortran/Makefile.in
+--- examples.orig/Fortran/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/Makefile.in 2015-07-01 16:12:02.186951503 +0100
+@@ -31,8 +31,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ subdir = examples/Fortran
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -338,7 +338,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -349,7 +349,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/scalars/Makefile.in examples/Fortran/scalars/Makefile.in
+--- examples.orig/Fortran/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/scalars/Makefile.in 2015-07-01 16:12:02.210952192 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = scalars_write$(EXEEXT) scalars_read$(EXEEXT)
+ subdir = examples/Fortran/scalars
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -327,7 +327,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -338,7 +338,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Fortran/schema/Makefile.in examples/Fortran/schema/Makefile.in
+--- examples.orig/Fortran/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Fortran/schema/Makefile.in 2015-07-01 16:12:02.198951848 +0100
+@@ -32,8 +32,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ noinst_PROGRAMS = uniform2d_f_noxml$(EXEEXT) \
+ rectilinear2d_f_noxml$(EXEEXT) structured2d_f_noxml$(EXEEXT) \
+ tri2d_f_noxml$(EXEEXT) tri2d_f_noxml_seperate$(EXEEXT)
+@@ -354,7 +354,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -365,7 +365,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+diff -urN examples.orig/Makefile.in examples/Makefile.in
+--- examples.orig/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ examples/Makefile.in 2015-07-01 16:12:02.226952652 +0100
+@@ -31,8 +31,8 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
++build_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
++host_triplet = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ subdir = examples
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -338,7 +338,7 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
++build = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+@@ -349,7 +349,7 @@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
++host = $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
diff --git a/debian/patches/series b/debian/patches/series
index 94941c0..081cf5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ numpy_paths.patch
exclude_cmake.patch
python_wrapper.patch
autotools-fixes.patch
+multiarch_safe.patch
--
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