[mathicgb] 04/06: debian/patches/link-deps.patch: New patch; properly link against mathic and memtailor.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sat Aug 12 22:35:00 UTC 2017


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

dtorrance-guest pushed a commit to branch master
in repository mathicgb.

commit 3cf53a13ea54dd21dd3dc4d589109409c54825b2
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sat Aug 12 18:06:59 2017 -0400

    debian/patches/link-deps.patch: New patch; properly link against mathic
    and memtailor.
---
 debian/patches/link-deps.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/link-deps.patch b/debian/patches/link-deps.patch
new file mode 100644
index 0000000..ca3783d
--- /dev/null
+++ b/debian/patches/link-deps.patch
@@ -0,0 +1,35 @@
+Description: Properly link against mathic and memtailor.
+Origin: https://github.com/Macaulay2/mathicgb/pull/10/commits/e23d59a996
+Last-Update: 2017-08-12
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -86,7 +86,7 @@
+   src/cli/MatrixAction.cpp src/cli/MatrixAction.hpp			\
+   src/cli/SigGBAction.hpp src/cli/SigGBAction.cpp			\
+   src/cli/HelpAction.hpp src/cli/HelpAction.cpp
+-mgb_LDADD = $(top_builddir)/libmathicgb.la $(DEPS_LIBS) -lmathic -lmemtailor -lpthread
++mgb_LDADD = $(top_builddir)/libmathicgb.la $(DEPS_LIBS) -lpthread
+ 
+ # set up tests to run on "make check"
+ if with_gtest
+@@ -97,7 +97,7 @@
+ # this prevents g++ 4.8.2 from crashing and churning through memory when compiling under Ubuntu 64 14.04.1
+ src/test/MonoMonoid.o src/test/Range.o : CXXFLAGS += -O0
+ 
+-unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.la $(DEPS_LIBS) -lmathic -lmemtailor -lpthread
++unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.la $(DEPS_LIBS) -lpthread
+ 
+ test_LIBS=
+ unittest_SOURCES=src/test/Range.cpp src/test/gtestInclude.cpp			\
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,6 +13,8 @@
+ # Check availability and location of dependencies
+ # PKG_CHECK_MODULES([MEMTAILOR], [memtailor])
+ # PKG_CHECK_MODULES([MATHIC], [mathic])
++MEMTAILOR_LIBS="-lmemtailor"
++MATHIC_LIBS="-lmathic"
+ 
+ # Locate the C++ compiler.
+ AC_PROG_CXX
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..45ffe61
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-deps.patch

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



More information about the debian-science-commits mailing list