[pnetcdf] 05/08: WIP: First cut for shared libs
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Jan 24 09:06:33 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 9db1cd7adabba37c389ef78ab2d20a678f832dfd
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jan 17 16:58:28 2016 +0000
WIP: First cut for shared libs
---
debian/patches/series | 1 +
debian/patches/shared.patch | 29 +++++++++++++++++++++++++++++
debian/rules | 7 ++++---
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 9a5ac8d..664f288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
destdir.patch
+shared.patch
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
new file mode 100644
index 0000000..34a1e5b
--- /dev/null
+++ b/debian/patches/shared.patch
@@ -0,0 +1,29 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add support for shared libraries
+Forwarded: no
+Last-Updated: 2016-01-22
+
+Index: pnetcdf-1.7.0~pre1/configure.in
+===================================================================
+--- pnetcdf-1.7.0~pre1.orig/configure.in
++++ pnetcdf-1.7.0~pre1/configure.in
+@@ -12,6 +12,10 @@ AC_CONFIG_SRCDIR([src/lib/pnetcdf.h.in])
+
+ AC_CONFIG_AUX_DIR([./scripts])
+
++LT_INIT([shared])
++AC_SUBST([LIBTOOL_DEPS])
++AC_CONFIG_MACRO_DIR([m4])
++
+ CONFIGURE_ARGS_CLEAN=`echo $* | tr '"' ' '`
+
+ dnl parse the version numbers to 4 env variables
+@@ -602,6 +606,8 @@ fi
+
+ AC_PROG_INSTALL
+
++AM_CONDITIONAL([CREATING_SHARED_LIBS], [test "x$enable_shared" = xyes])
++
+ have_yacc_lex=no
+ dnl Starting from PnetCDF 1.5.0, yacc and lex is no longer needed
+ dnl see comments in src/utils/ncmpigen/Makefile.in for build rules for
diff --git a/debian/rules b/debian/rules
index a22c0e1..e42f518 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,12 @@ override_dh_auto_clean:
override_dh_auto_configure:
dh_auto_configure --builddirectory=build-static
- dh_auto_configure --builddirectory=build-shared
+ dh_auto_configure --builddirectory=build-shared -- \
+ --enable-shared
override_dh_auto_build:
- $(MAKE) -c build-static
- #$(MAKE) -c build-shared
+ $(MAKE) -C build-static
+ #$(MAKE) -C build-shared
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