From 78e3a61a68c916450aa4e5ceecd20041583af901 Mon Sep 17 00:00:00 2001 From: Sébastien Fabbro Date: Sat, 29 Jul 2017 23:25:17 +0000 Subject: sci-libs/cddlib: version bump Package-Manager: Portage-2.3.6, Repoman-2.3.3 --- .../cddlib-094h-add-cdd_both_reps-binary.patch | 43 ++++++++++++++++++++++ .../cddlib/files/cddlib-094h-enforce-no-gmp.patch | 37 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch create mode 100644 sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch (limited to 'sci-libs/cddlib/files') diff --git a/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch b/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch new file mode 100644 index 000000000000..ba9a909abb19 --- /dev/null +++ b/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch @@ -0,0 +1,43 @@ +diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am +--- cddlib-094g/src-gmp/Makefile.am.orig 2012-07-05 13:30:30.982562213 -0400 ++++ cddlib-094g/src-gmp/Makefile.am 2012-07-05 13:31:14.576563881 -0400 +@@ -11,7 +11,8 @@ testcdd1_gmp \ + testcdd2_gmp \ + testlp1_gmp \ + testlp2_gmp \ +-testlp3_gmp ++testlp3_gmp \ ++cdd_both_reps_gmp + #cddmathlink + + scdd_gmp_SOURCES = simplecdd.c +@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES = tes + testlp1_gmp_SOURCES = testlp1.c + testlp2_gmp_SOURCES = testlp2.c + testlp3_gmp_SOURCES = testlp3.c ++cdd_both_reps_gmp_SOURCES = cdd_both_reps.c + # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c + + LDADD = ../lib-src-gmp/libcddgmp.la +diff -up cddlib-094g/src-gmp/Makefile.in.orig cddlib-094g/src-gmp/Makefile.in +diff -up cddlib-094g/src/Makefile.am.orig cddlib-094g/src/Makefile.am +--- cddlib-094g/src/Makefile.am.orig 2012-07-05 13:34:07.449570501 -0400 ++++ cddlib-094g/src/Makefile.am 2012-07-05 13:34:32.128571446 -0400 +@@ -11,7 +11,8 @@ testshoot \ + testcdd2 \ + testlp1 \ + testlp2 \ +-testlp3 ++testlp3 \ ++cdd_both_reps + #cddmathlink + + scdd_SOURCES = simplecdd.c +@@ -27,6 +28,7 @@ testcdd2_SOURCES = testcdd + testlp1_SOURCES = testlp1.c + testlp2_SOURCES = testlp2.c + testlp3_SOURCES = testlp3.c ++cdd_both_reps_SOURCES = cdd_both_reps.c + # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c + + LDADD = ../lib-src/libcdd.la diff --git a/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch b/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch new file mode 100644 index 000000000000..bab20025a793 --- /dev/null +++ b/sci-libs/cddlib/files/cddlib-094h-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 +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 -- cgit v1.2.3-65-gdbad