[exodus] 42/48: Build exodus static in a separate dir

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository exodus.

commit 9b087c73d03d9e7b99749c55befab738019c7abc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 16 09:59:08 2013 +0000

    Build exodus static in a separate dir
---
 debian/libexodusii-dev.install |  1 -
 debian/patches/soversion.patch | 17 +++++++++--------
 debian/rules                   | 10 +++++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/libexodusii-dev.install b/debian/libexodusii-dev.install
index 8549abe..f363502 100644
--- a/debian/libexodusii-dev.install
+++ b/debian/libexodusii-dev.install
@@ -1,3 +1,2 @@
-usr/include/exodusII_ext.h  
 usr/include/exodusII.h  
 usr/include/exodusII_int.h
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index 8f406e0..b4e7e7b 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -5,8 +5,8 @@ Last-Updated: 2011-10-11
 
 Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
 ===================================================================
---- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt	2013-12-15 17:56:40.000000000 +0000
-+++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt	2013-12-15 17:56:50.000000000 +0000
+--- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt	2013-12-15 18:16:04.000000000 +0000
++++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt	2013-12-15 18:16:07.000000000 +0000
 @@ -284,6 +284,8 @@
    set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
  ENDIF(MSVC)
@@ -18,8 +18,8 @@ Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
  ENDIF(EXODUS_LIBRARY_PROPERTIES)
 Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
 ===================================================================
---- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt	2013-12-15 17:56:40.000000000 +0000
-+++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt	2013-12-15 17:56:50.000000000 +0000
+--- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt	2013-12-15 18:16:04.000000000 +0000
++++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt	2013-12-15 18:16:07.000000000 +0000
 @@ -74,6 +74,7 @@
  
  ADD_LIBRARY(nemesis ${SOURCES})
@@ -30,14 +30,15 @@ Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
  TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
 Index: exodusii-6.02.dfsg.1/exodus/CMakeLists.txt
 ===================================================================
---- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt	2013-12-15 17:56:40.000000000 +0000
-+++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt	2013-12-15 18:05:56.000000000 +0000
-@@ -7,7 +7,7 @@
+--- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt	2013-12-15 18:16:04.000000000 +0000
++++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt	2013-12-15 19:40:00.000000000 +0000
+@@ -7,7 +7,8 @@
  SET(EXODUSII_VERSION "${EXODUSII_VERSION_MAJOR}.${EXODUSII_VERSION_MINOR}")
  SET(EXODUSII_VERSION_FULL "${EXODUSII_VERSION}.${EXODUSII_VERSION_PATCH}")
  
 -OPTION(BUILD_SHARED "Build the exodus libraries shared." OFF)
-+OPTION(BUILD_SHARED "Build the exodus libraries shared." ON)
++# OPTION(BUILD_SHARED "Build the exodus libraries shared." OFF)
++SET(BUILD_SHARED "${BUILD_SHARED_LIBS}")
  
  IF(BUILD_SHARED)
    SET(EXODUS_LIBRARY_TYPE SHARED)
diff --git a/debian/rules b/debian/rules
index 2d987fd..9b15c35 100644
--- a/debian/rules
+++ b/debian/rules
@@ -38,9 +38,13 @@ override_dh_auto_build:
 		cmake ../exodus -DCMAKE_INSTALL_PREFIX=$(PREFIX)  \
 			-DBUILD_SHARED_LIBS=TRUE -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro -Wl,--as-needed"  && \
 		$(MAKE))
+	mkdir -p exodus-static-build
+	( cd exodus-static-build && \
+		cmake ../exodus -DCMAKE_INSTALL_PREFIX=$(PREFIX)  \
+			-DBUILD_SHARED_LIBS=FALSE && $(MAKE) )
 	# Then build nemesis
 	ln -sf exodus exodusii
-	mkdir -p nemesis-build
+	mkdir -p nemesis-static-build
 	(cd nemesis-build && \
 		cmake ../nemesis -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/$(EX_SONAME_FULL)  && \
 		$(MAKE))
@@ -53,8 +57,8 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(MAKE) -C exodus-shared-build install
 	dh_auto_install
-	dh_install -p libexodusii-dev nemesis-build/libnemesis.a $(LIBDIR)
-	dh_install -p libexodusii-dev usr/lib/libexoIIv2c.a $(LIBDIR)
+	dh_install -p libexodusii-dev nemesis-static-build/libnemesis.a $(LIBDIR)
+	dh_install -p libexodusii-dev exodus-static-build/libexoIIv2c.a $(LIBDIR)
 	dh_install -p libexodusii-dev nemesis/ne_nemesisI.h /usr/include
 	dh_install -p libexodusii5  exodus-shared-build/cbind/$(EX_SONAME_FULL) $(LIBDIR)
 	dh_install -p libnemesis3  nemesis-shared-build/$(NE_SONAME_FULL) $(LIBDIR)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/exodus.git