[cddlib] 01/01: Enforce no linking against gmp for the non-gmp variants

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository cddlib.

commit c56ad14d10953784b64ee7cee56b9fa74cf1f316
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Oct 13 12:10:23 2016 +0200

    Enforce no linking against gmp for the non-gmp variants
---
 debian/changelog                    |  7 +++++++
 debian/patches/enforce-no-gmp.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 015c5bd..a818fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cddlib (094h-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Enforce no linking against GMP in the non-GMP variants.
+
+ -- Ximin Luo <infinity0 at debian.org>  Thu, 13 Oct 2016 03:50:43 +0200
+
 cddlib (094h-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/enforce-no-gmp.patch b/debian/patches/enforce-no-gmp.patch
new file mode 100644
index 0000000..bab2002
--- /dev/null
+++ b/debian/patches/enforce-no-gmp.patch
@@ -0,0 +1,37 @@
+Description: Don't link against gmp in the non-gmp version
+ Using AC_CHECK_LIB will add -lgmp to all children, but we don't want this
+ for the non-gmp variants. Instead, add -lgmp explicitly in gmp variants.
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: TBD
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.in
++++ b/configure.in
+@@ -14,8 +14,6 @@
+ dnl AC_CHECK_LIB(g, main)
+ dnl Replace `main' with a function in -lstdc:
+ dnl AC_CHECK_LIB(stdc, main)
+-dnl look for gmp:
+-AC_CHECK_LIB(gmp, main)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- a/lib-src-gmp/Makefile.am
++++ b/lib-src-gmp/Makefile.am
+@@ -25,4 +25,4 @@
+ setoper.h
+ 
+ AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
+-AM_LDFLAGS = -version-info 0:0:0
++AM_LDFLAGS = -lgmp -version-info 0:0:0
+--- a/src-gmp/Makefile.am
++++ b/src-gmp/Makefile.am
+@@ -32,7 +32,7 @@
+ # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
+ 
+ LDADD        = ../lib-src-gmp/libcddgmp.la
+-AM_LDFLAGS   = -L$(gmplibdir)
++AM_LDFLAGS   = -lgmp -L$(gmplibdir)
+ INCLUDES     = -I../lib-src-gmp
+ INCLUDES    += -I$(gmpincludedir)
+ AM_CPPFLAGS  = -DGMPRATIONAL
diff --git a/debian/patches/series b/debian/patches/series
index a3f04aa..6e71c82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build_cdd_both_reps.patch
+enforce-no-gmp.patch

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