Source: petsc Version: 3.4.2.dfsg1-8 Severity: important Tags: patch User: p...@debian.org Usertags: HDF5-transition
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, The hdf5 1.8.13 package in experimental features a new layout for headers and libraries, so that all the binary packages are now co-installable. Please find attached a patch proposal to support both the current and the new layouts. Because this bug is in the way of the hdf5 transition I intend to NMU in a few days. I apologize for the urge, and I hope this approach won't offend you. Please tell me otherwise. Kind regards, _g. - -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (500, 'testing'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 3.14-1-486 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCAAGBQJT2scnAAoJEO/obGx//s+DOasH/j4Nxon0btCsjKKi4GZGa/E0 DJDjwew21HfyQcgAlC5X7s03xZjyQXbJjyvP/0GznjuLCIX1ROdzaTyg935tAUhh NbQTGKw7BGVwmIXRke31QDcqVc8EWNECoSEV6quaag2c3pcrvb/q9TsH7Y3PcU8t G5sXoJHZdSzyNT4C9ckTcBPoQOe1ukCQlhgs0RYqSVOaB2nCT5qdb86WES8obRhi kTuZF7NvpWi8GFX1UV+hkN4Jcw2YXHbzRkFdxbWnUKbOl0PpMG/wiS0RGG4cTIb7 qc9N7ioz0yZSa5tDreOL/PgJfLUmSo5j+dvg0mYvljf19XTbA7d6WXdytY5uJpE= =cOUV -----END PGP SIGNATURE-----
diff -Nru petsc-3.4.2.dfsg1/debian/changelog petsc-3.4.2.dfsg1/debian/changelog --- petsc-3.4.2.dfsg1/debian/changelog 2014-04-24 19:31:39.000000000 +0200 +++ petsc-3.4.2.dfsg1/debian/changelog 2014-07-26 12:52:19.000000000 +0200 @@ -1,3 +1,10 @@ +petsc (3.4.2.dfsg1-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini <p...@debian.org> Sat, 26 Jul 2014 12:52:19 +0200 + petsc (3.4.2.dfsg1-8) unstable; urgency=medium * Team upload. diff -Nru petsc-3.4.2.dfsg1/debian/rules petsc-3.4.2.dfsg1/debian/rules --- petsc-3.4.2.dfsg1/debian/rules 2014-03-04 21:09:33.000000000 +0100 +++ petsc-3.4.2.dfsg1/debian/rules 2014-07-31 15:14:13.000000000 +0200 @@ -41,7 +41,18 @@ # complex) or non-standard distribution (e.g. contrib) is being used. PETSC_EXT=$(shell chmod +x debian/petsc-ext && debian/petsc-ext $(PETSC_ARCH) $(PETSC_MPI) $(DEBIAN_DIST) && chmod -x debian/petsc-ext) -PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi) +# Which MPI implementation? +# set ARCH_DEFAULT_MPI_IMPL +include /usr/share/mpi-default-dev/debian_defaults + +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),) + HDF5_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) + HDF5_LIB := $(HDF5_DIR)/libhdf5.so +else + HDF5_DIR := /usr + HDF5_LIB := $(HDF5_DIR)/lib/$(DEB_HOST_MULTIARCH)/libhdf5.so +endif +PETSC_HDF5_FLAGS=$(shell if [ -e $(HDF5_LIB) ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_DIR)"; fi) PETSC_BABEL_FLAGS=$(shell if [ -e /usr/lib/libsidl.so ]; then echo "--with-babel=1 --with-babel-dir=/usr"; fi) # PETSC_VERSION is used for the package names, library sonames, and @@ -423,7 +434,7 @@ echo "Unknown MPI implementation, stopping"; \ exit 1; \ fi - if [ -e /usr/lib/libhdf5.so ]; then \ + if [ -e $(HDF5_LIB) ]; then \ echo "hdf5-dev=libhdf5-mpi-dev" >> debian/lib$(PETSC_NAME)-dev.substvars; \ else \ echo "hdf5-dev=" >> debian/lib$(PETSC_NAME)-dev.substvars; \
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
