[xdmf] 26/38: Don't use exodusii as its buggy code
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 13 15:16:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository xdmf.
commit 2f3fc33b17e1b8ae45027727a9415383b515e644
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Aug 20 22:57:45 2016 +0100
Don't use exodusii as its buggy code
---
debian/control | 3 +--
debian/patches/exodus.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 3 +--
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index e39c9eb..b033061 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,7 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.4.0),
gfortran, swig,
bzip2, libbz2-dev,
libgzstream-dev,
- libmetis-dev,
- libexodusii-dev
+ libmetis-dev
Standards-Version: 3.9.8
Homepage: http://www.xdmf.org/
Vcs-Git: git://anonscm.debian.org/debian-science/packages/xdmf.git
diff --git a/debian/patches/exodus.patch b/debian/patches/exodus.patch
new file mode 100644
index 0000000..0c00c95
--- /dev/null
+++ b/debian/patches/exodus.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add name of library as seen on Debian
+Last-Updated: 2016-08-21
+Forwarded: no
+
+Index: xdmf-3.0+git20160803/CMake/FindExodus.cmake
+===================================================================
+--- xdmf-3.0+git20160803.orig/CMake/FindExodus.cmake
++++ xdmf-3.0+git20160803/CMake/FindExodus.cmake
+@@ -9,7 +9,7 @@ FIND_PACKAGE(NetCDF REQUIRED)
+
+ FIND_PATH(EXODUS_INCLUDE_DIR NAMES exodusII.h)
+
+-FIND_LIBRARY(EXODUS_LIBRARIES NAMES exodusii exodusIIv2c)
++FIND_LIBRARY(EXODUS_LIBRARIES NAMES exodusii exodusIIv2c exoIIv2)
+
+ INCLUDE(FindPackageHandleStandardArgs)
+
diff --git a/debian/patches/series b/debian/patches/series
index aca400c..f045637 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ c++11.patch
gzstream.patch
python-install-dir.patch
python3.patch
+exodus.patch
diff --git a/debian/rules b/debian/rules
index 3dba480..010cb50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,7 @@ CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON
-DXDMF_WRAP_PYTHON=ON \
-DXDMF_REGENERATE_WRAPPERS=ON \
-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so \
- -DBUILD_SHARED_LIBS=TRUE \
- -DXDMF_BUILD_EXODUS_IO=ON
+ -DBUILD_SHARED_LIBS=TRUE
override_dh_auto_configure:
mkdir -p $(BUILD_DIRS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xdmf.git
More information about the debian-science-commits
mailing list