[esys-particle] 05/09: Force linking with boost_python.
Anton Gladky
gladk at moszumanska.debian.org
Sat Jan 25 15:56:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository esys-particle.
commit 754563bd1d41700ae30c68d26db47d1de1f8bb79
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date: Sat Jan 25 14:52:58 2014 +0100
Force linking with boost_python.
---
debian/control | 1 +
debian/patches/03_ax-boost.patch | 106 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 8 +--
4 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 11419f9..94604e8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: science
Priority: extra
Build-Depends:
autoconf (>= 2.59),
+ autoconf-archive,
automake (>= 1.8.2),
autotools-dev,
debhelper (>= 9),
diff --git a/debian/patches/03_ax-boost.patch b/debian/patches/03_ax-boost.patch
new file mode 100644
index 0000000..aa25536
--- /dev/null
+++ b/debian/patches/03_ax-boost.patch
@@ -0,0 +1,106 @@
+Description: use ax_boost_* macros
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -352,21 +352,21 @@
+ PYTHON_MAJOR_VERSION=`python -c "from __future__ import print_function;import sys;print(sys.version_info[[0]])"`
+ PYTHON_MINOR_VERSION=`python -c "from __future__ import print_function;import sys;print(sys.version_info[[1]])"`
+ if [[ $PYTHON_MAJOR_VERSION -ge 4 ]]; then
+- BOOST_REQUIRE([1.47.0])
++ AX_BOOST_BASE([1.47.0])
+ elif [[ $PYTHON_MAJOR_VERSION -ge 3 ]]; then
+ if [[ $PYTHON_MINOR_VERSION -ge 2 ]]; then
+- BOOST_REQUIRE([1.47.0])
++ AX_BOOST_BASE([1.47.0])
+ else
+- BOOST_REQUIRE([1.41.0])
++ AX_BOOST_BASE([1.41.0])
+ fi
+ else
+- BOOST_REQUIRE([1.34.1])
++ AX_BOOST_BASE([1.34.1])
+ fi
+
+
+ # Check for boost filesystem and python libraries
+-BOOST_FILESYSTEM
+-BOOST_PYTHON
++AX_BOOST_FILESYSTEM
++AX_BOOST_PYTHON
+
+ # check for SILO library
+ if test "x${wants_silo}" = "xtrue"; then
+--- a/Foundation/Makefile.am
++++ b/Foundation/Makefile.am
+@@ -15,9 +15,9 @@
+
+ lib_LTLIBRARIES=libFoundation.la
+
+-libFoundation_la_LIBADD = $(BOOST_FILESYSTEM_LIBS) $(BOOST_PYTHON_LIBS)
+-libFoundation_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PYTHON_LDFLAGS)
+-libFoundation_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_PYTHON_CPPFLAGS)
++libFoundation_la_LIBADD = $(BOOST_FILESYSTEM_LIB) $(BOOST_PYTHON_LIB)
++libFoundation_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_LDFLAGS)
++libFoundation_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS)
+
+ libFoundation_la_SOURCES = \
+ console.cpp \
+--- a/Python/BoostPythonUtil/Makefile.am
++++ b/Python/BoostPythonUtil/Makefile.am
+@@ -17,5 +17,5 @@
+
+ libBoostPythonUtil_la_SOURCES = ListConverter.h ListConverter.cpp Util.h \
+ PythonIterIterator.h PythonIterIterator.hpp
+-libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIBS)
++libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIB)
+
+--- a/Python/MpiPython/Makefile.am
++++ b/Python/MpiPython/Makefile.am
+@@ -29,7 +29,7 @@
+ $(top_builddir)/Model/libModel.la \
+ $(top_builddir)/tml/message/libTmlMessage.la \
+ $(top_builddir)/tml/type/libTmlType.la \
+- $(BOOST_FILESYSTEM_LIBS)
++ $(BOOST_FILESYSTEM_LIB)
+
+ esysparticle_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LTLDFLAGS)
+
+--- a/Python/esys/lsm/util/Makefile.am
++++ b/Python/esys/lsm/util/Makefile.am
+@@ -48,11 +48,11 @@
+ libFoundationPy_la_LIBADD = \
+ $(top_builddir)/Foundation/libFoundation.la \
+ $(top_builddir)/Python/BoostPythonUtil/libBoostPythonUtil.la \
+- $(BOOST_PYTHON_LIBS)
++ $(BOOST_PYTHON_LIB)
+
+ FoundationPy_la_LDFLAGS = -module -shared -shrext $(PYTHON_DLL_EXT)
+ FoundationPy_la_SOURCES = ExportModuleUtil.cpp
+-FoundationPy_la_LIBADD = libFoundationPy.la
++FoundationPy_la_LIBADD = libFoundationPy.la $(BOOST_PYTHON_LIB)
+
+
+ dist_lsmutil_PYTHON = \
+--- a/Tools/StressCalculator/Makefile.am
++++ b/Tools/StressCalculator/Makefile.am
+@@ -27,7 +27,7 @@
+ Main.cpp
+
+ raw2tostress_LDADD = \
+- $(BOOST_FILESYSTEM_LIBS) \
++ $(BOOST_FILESYSTEM_LIB) \
+ libStressCalculator.la \
+ $(top_builddir)/Foundation/libFoundation.la
+
+--- a/Tools/dump2vtk/Makefile.am
++++ b/Tools/dump2vtk/Makefile.am
+@@ -22,7 +22,7 @@
+ $(top_builddir)/Foundation/libFoundation.la \
+ $(top_builddir)/Geometry/libGgGeometry.la \
+ $(top_builddir)/Parallel/libParallel.la \
+- $(BOOST_FILESYSTEM_LIBS)
++ $(BOOST_FILESYSTEM_LIB)
+
+ dump2vtk_SOURCES = \
+ main.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index abd746f..3012a80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_remove_obsolete_dir.patch
02_remove_bzr_version.patch
+03_ax-boost.patch
diff --git a/debian/rules b/debian/rules
index 248026c..2989862 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
+
%:
dh $@ --parallel --with autoreconf
@@ -15,16 +17,16 @@ export NO_PNG_PKG_MANGLE := 1
CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS := -lboost_system $(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS := -lboost_python -lboost_system $(shell dpkg-buildflags --get LDFLAGS)
extra_flags += CC=mpicc CXX=mpicxx CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)'\
LDFLAGS='$(LDFLAGS)' --with-epydoc --with-vtk
override_dh_auto_configure:
- dh_auto_configure -- $(extra_flags)
+ dh_auto_configure -- $(extra_flags) --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_auto_build:
- dh_auto_build
+ dh_auto_build --parallel
doxygen
override_dh_pysupport:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/esys-particle.git
More information about the debian-science-commits
mailing list