[adios] 140/207: Test pkgconfig patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:49 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 abec36f0b7bda3a815a297ca59459053467e24b1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 11 13:02:10 2014 +0100
Test pkgconfig patch
---
debian/adios_config | 3 +-
debian/changelog | 6 +++
debian/patches/pkgconfig.patch | 94 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/debian/adios_config b/debian/adios_config
index 62cffa7..1f89932 100755
--- a/debian/adios_config
+++ b/debian/adios_config
@@ -3,8 +3,7 @@
# Print compiler/linker flags to use ADIOS
# Version based on pkg-config, works with Multiarch.
# - Alastair McKinstry, <mckinstry at debian.org>
-
-#
+# Last Updated: 2014-06-11. FIXME CHECK
function Usage () {
diff --git a/debian/changelog b/debian/changelog
index e86b393..436ad4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.6.0-8) UNRELEASED; urgency=medium
+
+ * Test pkgconfig patch.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 11 Jun 2014 13:01:52 +0100
+
adios (1.6.0-7) unstable; urgency=medium
* Use python3-all-dev to build on all python3 versions.
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
new file mode 100644
index 0000000..0040668
--- /dev/null
+++ b/debian/patches/pkgconfig.patch
@@ -0,0 +1,94 @@
+Index: adios-1.6.0/adios.pc.in
+===================================================================
+--- /dev/null
++++ adios-1.6.0/adios.pc.in
+@@ -0,0 +1,56 @@
++# Standard defines for pkg-config
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=${prefix}/lib/x86_64-linux-gnu
++includedir=${prefix}/include
++
++#
++# Configuration values from configure script
++#
++
++# Install directory
++ADIOS_DIR="@prefix@"
++
++# Flags to build code using ADIOS write API (and read API)
++ADIOS_INC="-I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@"
++ADIOS_CLIB="-L${ADIOS_DIR}/lib -ladios @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_FLIB="-L${ADIOS_DIR}/lib -ladiosf @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosf_v1 @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++
++# Flags to build code using ADIOS read API only
++ADIOSREAD_INC="-I${ADIOS_DIR}/include @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
++ADIOSREAD_V1_INC="-I${ADIOS_DIR}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
++ADIOSREAD_CLIB="-L${ADIOS_DIR}/lib -ladiosread @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_v1 @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++
++# Flags to build code using ADIOS read API only in a sequential code (no MPI)
++ADIOSREAD_SEQ_INC="-I${ADIOS_DIR}/include @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
++ADIOSREAD_SEQ_V1_INC="-I${ADIOS_DIR}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
++ADIOSREAD_SEQ_CLIB="-L${ADIOS_DIR}/lib -ladiosread_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_nompi_v1 @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++
++#Flags to build code using ADIOS write API in a sequential code (no MPI)
++ADIOS_SEQ_INC="-I${ADIOS_DIR}/include @ADIOSLIB_SEQ_CPPFLAGS@ @ADIOSLIB_SEQ_CFLAGS@"
++ADIOS_SEQ_CLIB="-L${ADIOS_DIR}/lib -ladios_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_FLIB="-L${ADIOS_DIR}/lib -ladiosf_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosf_nompi_v1 @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++
++#The following flags are not used. It is only for internal utilities of ADIOS, using libadios_internal_nompi.a
++ADIOS_INT_INC="-I${ADIOS_DIR}/include @ADIOSLIB_INT_CPPFLAGS@ @ADIOSLIB_INT_CFLAGS@"
++ADIOS_INT_CLIB="-L${ADIOS_DIR}/lib -ladios_internal_nompi @ADIOSLIB_INT_LDFLAGS@ @ADIOSLIB_INT_LDADD@ @LDFLAGS@ @LIBS@"
++
++VERSIONSTRING="@VERSION@"
++
++
++Name: adios
++Description: Adaptable IO system
++Requires:
++Version: @VERSION@
++Cflags: -I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
++Libs: ${ADIOS_CLIB}
++Libs.private: -ldl
++Cflags: -pthread
++
++
+Index: adios-1.6.0/configure.ac
+===================================================================
+--- adios-1.6.0.orig/configure.ac
++++ adios-1.6.0/configure.ac
+@@ -694,6 +694,7 @@ AC_CONFIG_FILES([Makefile
+ examples/Fortran/global-array/Makefile
+ examples/Fortran/global-array-time/Makefile
+ adios_config.flags
++ adios.pc
+ ])
+
+ AC_OUTPUT
+Index: adios-1.6.0/Makefile.in
+===================================================================
+--- adios-1.6.0.orig/Makefile.in
++++ adios-1.6.0/Makefile.in
+@@ -83,7 +83,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = utils/skel/lib/skel_have_adios_timing.py \
+- adios_config.flags
++ adios_config.flags adios.pc
+ CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -404,6 +404,7 @@ SUBDIRS = src utils tests examples
+ EXTRA_DIST = runconf \
+ KNOWN_BUGS \
+ adios_config \
++ adios.pc \
+ scripts/create.nssi.config.sh \
+ scripts/kill.nssi.staging.sh \
+ scripts/start.nssi.staging.sh
diff --git a/debian/patches/series b/debian/patches/series
index 88a7b75..d3c6966 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ netcdf-fix.patch
python3.patch
debian_paths.patch
mpi4py_fix.patch
+pkgconfig.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