[hdf5] 03/08: Fix installation paths and libraries names
Gilles Filippini
pini at moszumanska.debian.org
Tue Jul 8 20:51:56 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository hdf5.
commit 339f09884156884ccfb500a8ce6856da8623b07f
Author: Gilles Filippini <pini at debian.org>
Date: Sat Jul 5 11:39:24 2014 +0200
Fix installation paths and libraries names
* add flavor name for every flavors, including serial
* don't add flavor name for CPP libraries
* install includes into /usr/include/hdf5/<flavor>/
* install links for upstream libraries names into
/usr/lib/<multiarch>/hdf5/<flavor>/
---
debian/hdf5-mpich.pc | 2 +-
debian/hdf5-openmpi.pc | 2 +-
debian/{hdf5.pc => hdf5-serial.pc} | 4 +-
debian/libhdf5-flavor-cpp-soname.install.in | 4 +-
debian/libhdf5-flavor-dev.install.in | 6 +-
debian/libhdf5-flavor-dev.links.in | 16 +--
debian/patches/flavor-configure-option.patch | 168 +++++++--------------------
debian/rules | 10 +-
8 files changed, 61 insertions(+), 151 deletions(-)
diff --git a/debian/hdf5-mpich.pc b/debian/hdf5-mpich.pc
index 1c01efb..7f80ea6 100644
--- a/debian/hdf5-mpich.pc
+++ b/debian/hdf5-mpich.pc
@@ -2,5 +2,5 @@ Name: HDF5
Description: Hierarchical Data Format 5 (HDF5) - MPICH version
Version: 1.8.13
Requires: mpich
-Cflags:
+Cflags: -I/usr/include/hdf5/mpich
Libs: -lhdf5_mpich
diff --git a/debian/hdf5-openmpi.pc b/debian/hdf5-openmpi.pc
index a59bf14..69c3443 100644
--- a/debian/hdf5-openmpi.pc
+++ b/debian/hdf5-openmpi.pc
@@ -2,5 +2,5 @@ Name: HDF5
Description: Hierarchical Data Format 5 (HDF5) - OpenMPI version
Version: 1.8.13
Requires:
-Cflags: -I/usr/include/openmpi
+Cflags: -I/usr/include/openmpi -I/usr/include/hdf5/openmpi
Libs: -lhdf5_openmpi -L/usr/lib/openmpi/lib -lmpi
diff --git a/debian/hdf5.pc b/debian/hdf5-serial.pc
similarity index 60%
rename from debian/hdf5.pc
rename to debian/hdf5-serial.pc
index e4a0da8..df64a14 100644
--- a/debian/hdf5.pc
+++ b/debian/hdf5-serial.pc
@@ -2,5 +2,5 @@ Name: HDF5
Description: Hierarchical Data Format 5 (HDF5)
Version: 1.8.13
Requires:
-Cflags:
-Libs: -lhdf5
+Cflags: -I/usr/include/hdf5/serial
+Libs: -lhdf5_serial
diff --git a/debian/libhdf5-flavor-cpp-soname.install.in b/debian/libhdf5-flavor-cpp-soname.install.in
index 866e92c..60789a2 100644
--- a/debian/libhdf5-flavor-cpp-soname.install.in
+++ b/debian/libhdf5-flavor-cpp-soname.install.in
@@ -1,2 +1,2 @@
-usr/lib/*/libhdf5 at FLAVORLIB@_cpp.so.*
-usr/lib/*/libhdf5 at FLAVORLIB@_hl_cpp.so.*
+usr/lib/*/libhdf5_cpp.so.*
+usr/lib/*/libhdf5_hl_cpp.so.*
diff --git a/debian/libhdf5-flavor-dev.install.in b/debian/libhdf5-flavor-dev.install.in
index 5b64666..1c1742b 100644
--- a/debian/libhdf5-flavor-dev.install.in
+++ b/debian/libhdf5-flavor-dev.install.in
@@ -1,6 +1,6 @@
usr/include
-usr/lib/*/libhdf5 at FLAVORLIB@*.so
-usr/lib/*/libhdf5 at FLAVORLIB@*.settings
-usr/lib/*/libhdf5 at FLAVORLIB@*.a
+usr/lib/*/libhdf5*.so
+usr/lib/*/libhdf5*.settings
+usr/lib/*/libhdf5*.a
@IFMPI at usr/bin/h5pcc
@IFMPI at usr/bin/h5pfc
diff --git a/debian/libhdf5-flavor-dev.links.in b/debian/libhdf5-flavor-dev.links.in
index 4185222..4a689f6 100644
--- a/debian/libhdf5-flavor-dev.links.in
+++ b/debian/libhdf5-flavor-dev.links.in
@@ -1,9 +1,9 @@
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5.so
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_fortran.so
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl.so
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.so usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5hl_fortran.so
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.so
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.so
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.so
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.so
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5.a
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_fortran.a
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5_hl.a
- at IFMPI@usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.a usr/lib/@MULTIARCH@/@FLAVOR@/libhdf5hl_fortran.a
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.a
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_fortran.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.a
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@_hl.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.a
+usr/lib/@MULTIARCH@/libhdf5 at FLAVORLIB@hl_fortran.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.a
diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 4c183e1..0cc5e10 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -6,10 +6,10 @@ Description: Add option --with-flavor=<flavor-name> to configure
* serial is built with no flavor name
* $mpi parallel versions use --with-flavor=$mpi
Author: Gilles Filippini <pini at debian.org>
-Index: hdf5/configure.ac
+Index: hdf5-1.8.13+docs/configure.ac
===================================================================
---- hdf5.orig/configure.ac
-+++ hdf5/configure.ac
+--- hdf5-1.8.13+docs.orig/configure.ac
++++ hdf5-1.8.13+docs/configure.ac
@@ -4494,6 +4494,24 @@ fi
##
AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
@@ -35,10 +35,10 @@ Index: hdf5/configure.ac
AC_CONFIG_FILES([src/libhdf5.settings
Makefile
src/Makefile
-Index: hdf5/src/libhdf5.settings.in
+Index: hdf5-1.8.13+docs/src/libhdf5.settings.in
===================================================================
---- hdf5.orig/src/libhdf5.settings.in
-+++ hdf5/src/libhdf5.settings.in
+--- hdf5-1.8.13+docs.orig/src/libhdf5.settings.in
++++ hdf5-1.8.13+docs/src/libhdf5.settings.in
@@ -12,6 +12,7 @@ General Information:
Byte sex: @BYTESEX@
Libraries: @STATIC_SHARED@
@@ -47,10 +47,10 @@ Index: hdf5/src/libhdf5.settings.in
Compiling Options:
------------------
-Index: hdf5/src/Makefile.am
+Index: hdf5-1.8.13+docs/src/Makefile.am
===================================================================
---- hdf5.orig/src/Makefile.am
-+++ hdf5/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/src/Makefile.am
++++ hdf5-1.8.13+docs/src/Makefile.am
@@ -29,10 +29,10 @@ include $(top_srcdir)/config/lt_vers.am
noinst_PROGRAMS = H5detect H5make_libsettings
@@ -93,10 +93,10 @@ Index: hdf5/src/Makefile.am
@for dep in $? dummy; do \
if test $$dep != "dummy" -a -n "$(PERL)"; then \
case "$$dep" in \
-Index: hdf5/test/testlibinfo.sh.in
+Index: hdf5-1.8.13+docs/test/testlibinfo.sh.in
===================================================================
---- hdf5.orig/test/testlibinfo.sh.in
-+++ hdf5/test/testlibinfo.sh.in
+--- hdf5-1.8.13+docs.orig/test/testlibinfo.sh.in
++++ hdf5-1.8.13+docs/test/testlibinfo.sh.in
@@ -79,7 +79,7 @@ fi
# built too.
if [ -n $Shared_Lib ]; then
@@ -118,10 +118,10 @@ Index: hdf5/test/testlibinfo.sh.in
fi
# Check if executables has the lib information only if shared lib is not
-Index: hdf5/tools/misc/h5cc.in
+Index: hdf5-1.8.13+docs/tools/misc/h5cc.in
===================================================================
---- hdf5.orig/tools/misc/h5cc.in
-+++ hdf5/tools/misc/h5cc.in
+--- hdf5-1.8.13+docs.orig/tools/misc/h5cc.in
++++ hdf5-1.8.13+docs/tools/misc/h5cc.in
@@ -172,7 +172,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -159,45 +159,10 @@ Index: hdf5/tools/misc/h5cc.in
;;
*)
new_libraries="$new_libraries $lib"
-Index: hdf5/c++/src/Makefile.am
+Index: hdf5-1.8.13+docs/c++/src/h5c++.in
===================================================================
---- hdf5.orig/c++/src/Makefile.am
-+++ hdf5/c++/src/Makefile.am
-@@ -25,10 +25,10 @@ include $(top_srcdir)/config/lt_vers.am
- AM_CPPFLAGS+=-I$(top_srcdir)/src
-
- # This is our main target
--lib_LTLIBRARIES=libhdf5_cpp.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@_cpp.la
-
- # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
--libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
- # Shared C++ libraries aren't universally supported.
- if CXX_SHARED_CONDITIONAL
-@@ -39,7 +39,7 @@ endif
- bin_SCRIPTS=h5c++
-
- # Source files for the library
--libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp \
-+libhdf5 at FLAVOR@_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp \
- H5Attribute.cpp H5Location.cpp H5Object.cpp H5PropList.cpp \
- H5FaccProp.cpp H5FcreatProp.cpp H5DcreatProp.cpp H5DxferProp.cpp \
- H5DataType.cpp H5DataSpace.cpp H5AbstractDs.cpp H5AtomType.cpp \
-@@ -48,7 +48,7 @@ libhdf5_cpp_la_SOURCES=H5Exception.cpp H
- H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp
-
- # HDF5 C++ library depends on HDF5 Library.
--libhdf5_cpp_la_LIBADD=$(LIBHDF5)
-+libhdf5 at FLAVOR@_cpp_la_LIBADD=$(LIBHDF5)
-
- # Public headers
- include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
-Index: hdf5/c++/src/h5c++.in
-===================================================================
---- hdf5.orig/c++/src/h5c++.in
-+++ hdf5/c++/src/h5c++.in
+--- hdf5-1.8.13+docs.orig/c++/src/h5c++.in
++++ hdf5-1.8.13+docs/c++/src/h5c++.in
@@ -161,7 +161,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -207,19 +172,7 @@ Index: hdf5/c++/src/h5c++.in
status=$?
}
-@@ -315,9 +315,9 @@ if test "x$do_link" = "xyes"; then
- shared_link=""
- # conditionnaly link with the hl library
- if test "X$HL" = "Xhl"; then
-- libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
-+ libraries=" $libraries -lhdf5 at FLAVOR@_hl_cpp -lhdf5 at FLAVOR@_cpp -lhdf5 at FLAVOR@_hl -lhdf5 at FLAVOR@ "
- else
-- libraries=" $libraries -lhdf5_cpp -lhdf5 "
-+ libraries=" $libraries -lhdf5 at FLAVOR@_cpp -lhdf5 at FLAVOR@ "
- fi
- link_args="$link_args -L${libdir}"
-
-@@ -347,17 +347,17 @@ if test "x$do_link" = "xyes"; then
+@@ -347,11 +347,11 @@ if test "x$do_link" = "xyes"; then
new_libraries=""
for lib in $libraries; do
case "$lib" in
@@ -233,22 +186,12 @@ Index: hdf5/c++/src/h5c++.in
+ -lhdf5 at FLAVOR@_hl)
+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl.a"
;;
-- -lhdf5_cpp)
-- new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
-+ -lhdf5 at FLAVOR@_cpp)
-+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_cpp.a"
- ;;
-- -lhdf5_hl_cpp)
-- new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a"
-+ -lhdf5 at FLAVOR@_hl_cpp)
-+ new_libraries="$new_libraries ${libdir}/libhdf5 at FLAVOR@_hl_cpp.a"
- ;;
- *)
- new_libraries="$new_libraries $lib"
-Index: hdf5/fortran/src/h5fc.in
+ -lhdf5_cpp)
+ new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
+Index: hdf5-1.8.13+docs/fortran/src/h5fc.in
===================================================================
---- hdf5.orig/fortran/src/h5fc.in
-+++ hdf5/fortran/src/h5fc.in
+--- hdf5-1.8.13+docs.orig/fortran/src/h5fc.in
++++ hdf5-1.8.13+docs/fortran/src/h5fc.in
@@ -156,7 +156,7 @@ usage() {
# libhdf5.settings file reside in the lib directory.
showconfigure()
@@ -296,10 +239,10 @@ Index: hdf5/fortran/src/h5fc.in
;;
*)
new_libraries="$new_libraries $lib"
-Index: hdf5/fortran/src/Makefile.am
+Index: hdf5-1.8.13+docs/fortran/src/Makefile.am
===================================================================
---- hdf5.orig/fortran/src/Makefile.am
-+++ hdf5/fortran/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/fortran/src/Makefile.am
++++ hdf5-1.8.13+docs/fortran/src/Makefile.am
@@ -29,10 +29,10 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_
AM_FCLIBS=$(LIBHDF5)
@@ -331,10 +274,10 @@ Index: hdf5/fortran/src/Makefile.am
# h5fc is generated during configure.
# Remove it only when distclean.
-Index: hdf5/hl/src/Makefile.am
+Index: hdf5-1.8.13+docs/hl/src/Makefile.am
===================================================================
---- hdf5.orig/hl/src/Makefile.am
-+++ hdf5/hl/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/hl/src/Makefile.am
++++ hdf5-1.8.13+docs/hl/src/Makefile.am
@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
AM_CPPFLAGS+=-I$(top_srcdir)/src
@@ -356,40 +299,10 @@ Index: hdf5/hl/src/Makefile.am
# Public header files (to be installed)
include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
-Index: hdf5/hl/c++/src/Makefile.am
-===================================================================
---- hdf5.orig/hl/c++/src/Makefile.am
-+++ hdf5/hl/c++/src/Makefile.am
-@@ -25,10 +25,10 @@ include $(top_srcdir)/config/lt_vers.am
- AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
-
- # This is our main target
--lib_LTLIBRARIES=libhdf5_hl_cpp.la
-+lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl_cpp.la
-
- # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
--libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-
- # Shared C++ libraries aren't universally supported.
- if CXX_SHARED_CONDITIONAL
-@@ -38,10 +38,10 @@ endif
-
- # Source files for the library
- # At the moment, only the H5PT Packet Table has a C++ API.
--libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
-+libhdf5 at FLAVOR@_hl_cpp_la_SOURCES=H5PacketTable.cpp
-
- # HDF5 HL C++ library depends on HDF5 Library.
--libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
-+libhdf5 at FLAVOR@_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
-
- # Public headers
- include_HEADERS=H5PacketTable.h
-Index: hdf5/hl/fortran/src/Makefile.am
+Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.am
-+++ hdf5/hl/fortran/src/Makefile.am
+--- hdf5-1.8.13+docs.orig/hl/fortran/src/Makefile.am
++++ hdf5-1.8.13+docs/hl/fortran/src/Makefile.am
@@ -27,10 +27,10 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top
AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -417,11 +330,11 @@ Index: hdf5/hl/fortran/src/Makefile.am
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
-Index: hdf5/config/commence.am
+Index: hdf5-1.8.13+docs/config/commence.am
===================================================================
---- hdf5.orig/config/commence.am
-+++ hdf5/config/commence.am
-@@ -32,15 +32,15 @@ CP=cp
+--- hdf5-1.8.13+docs.orig/config/commence.am
++++ hdf5-1.8.13+docs/config/commence.am
+@@ -32,14 +32,14 @@ CP=cp
RUNEXEC=$(RUNSERIAL)
# Libraries to link to while building
@@ -431,15 +344,12 @@ Index: hdf5/config/commence.am
-LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
+LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
--LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
-+LIBH5CPP=$(top_builddir)/c++/src/libhdf5 at FLAVOR@_cpp.la
+ LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
--LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
+LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
-+LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5 at FLAVOR@_hl_cpp.la
+ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
# Install directories that automake doesn't know about
- docdir = $(exec_prefix)/doc
diff --git a/debian/rules b/debian/rules
index e5639b5..d7ec848 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,9 +88,9 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
--enable-shared --enable-production=$(USE_PROD) \
--disable-sharedlib-rpath --with-zlib --with-default-api-version=v18 \
--enable-fortran
-SERIAL_FLAGS = --enable-threadsafe --enable-cxx --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-OPENMPI_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/openmpi --with-flavor=openmpi
-MPICH_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/mpich --with-flavor=mpich
+SERIAL_FLAGS = --enable-threadsafe --enable-cxx --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/hdf5/serial --with-flavor=serial
+OPENMPI_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/hdf5/openmpi --with-flavor=openmpi
+MPICH_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/hdf5/mpich --with-flavor=mpich
configure: configure-stamp-debian configure-stamp \
$(configure_stamp_openmpi) configure-stamp-mpich
@@ -108,9 +108,9 @@ configure-stamp-debian: debian/control.in
continue ; \
fi ; \
flavorpkgstr="-$$flavor" ; \
- flavorlibstr="_$$flavor" ; \
ifmpi="" ; \
fi ; \
+ flavorlibstr="_$$flavor" ; \
helper=`echo $$helper | sed 's/-flavor/'$$flavorpkgstr'/'` ; \
sed -e 's/@FLAVORLIB@/'$$flavorlibstr'/g' \
-e 's/@FLAVORPKG@/'$$flavorpkgstr'/g' \
@@ -228,7 +228,7 @@ install-serial: build-stamp
dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools -p$(sercpppack) \
--sourcedir=debian/build/tmpinst
find debian/$(serpack)/usr/lib -name '*cpp*' -delete
- install -m644 -D debian/hdf5.pc debian/$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5.pc
+ install -m644 -D debian/hdf5-serial.pc debian/$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5-serial.pc
install-openmpi: build-stamp-openmpi
dh_testdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list