[pnetcdf] 02/08: * Make libpnetcdf0d properly Multi-Arch. * Ensure no rpath in shared lib.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Dec 7 12:31:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository pnetcdf.
commit ecee42e8a7ec37f221074b47b267c5667dc93cd4
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Feb 19 18:49:43 2016 +0000
* Make libpnetcdf0d properly Multi-Arch.
* Ensure no rpath in shared lib.
---
debian/changelog | 2 ++
debian/control | 3 ++-
debian/copyright | 2 +-
debian/rules | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c36245b..84b0d1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pnetcdf (1.7.0~pre1-2) UNRELEASED; urgency=medium
* Add dependency on libpnetcdf0d to -dev package.
* Add pkgconfig support
+ * Make libpnetcdf0d properly Multi-Arch.
+ * Ensure no rpath in shared lib.
-- Alastair McKinstry <mckinstry at debian.org> Fri, 19 Feb 2016 06:15:51 +0000
diff --git a/debian/control b/debian/control
index 25717f7..ed9305a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
Build-Depends: autoconf, automake, dh-autoreconf,
- gfortran, mpi-default-dev,
+ gfortran, mpi-default-dev, chrpath,
texlive-latex-base, ghostscript,
debhelper (>= 9)
Standards-Version: 3.9.6
@@ -45,6 +45,7 @@ Description: Programs for reading and writing parallel NetCDF files
Package: libpnetcdf0d
Architecture: any
Section: libs
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libraryfor reading and writing parallel NetCDF files
diff --git a/debian/copyright b/debian/copyright
index 9555431..5171699 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: parallel-netcdf at mcs.anl.gov
Source: https://trac.mcs.anl.gov/projects/parallel-netcdf
Files: *
-Copyright (c) 2003 Northwestern University and Argonne National Laboratory
+Copyright: (c) 2003 Northwestern University and Argonne National Laboratory
License: Northwestern
Files: src/lib/utf8proc.c
diff --git a/debian/rules b/debian/rules
index f860f26..64e4329 100644
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_build:
( cd build-shared/src/lib && \
mpicxx -shared -o $(SHLIB) -Wl,--soname -Wl,$(SHLIB) $(LDFLAGS) \
-Wl,--whole-archive libpnetcdf.a -Wl,--no-whole-archive -lgfortran )
+ chrpath -d ./build-shared/src/lib/libpnetcdf.so.0d
override_dh_auto_install:
$(MAKE) -C build-static install DESTDIR=$(DESTDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pnetcdf.git
More information about the debian-science-commits
mailing list