[libfann] 19/34: Update patch Link-against-libm.patch

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 83e8e77caa5152a9e7d7b596b03e32ac6694416a
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:33:41 2015 +0200

    Update patch Link-against-libm.patch
---
 debian/patches/Link-against-libm.patch | 81 +++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/debian/patches/Link-against-libm.patch b/debian/patches/Link-against-libm.patch
index ff01a9e..463729e 100644
--- a/debian/patches/Link-against-libm.patch
+++ b/debian/patches/Link-against-libm.patch
@@ -1,36 +1,55 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 4 Jun 2010 23:28:23 +0200
-Subject: [PATCH] Link against libm
+From: Christian Kastner <ckk at debian.org>
+Date: Sat, 26 Sep 2015 02:50:14 +0200
+Subject: Link against libm
 
-Upstream's autotools setup does not detect if linking against libm is
-necessary, so we extend it to do that.
+The libraries need to be explicitly linked against libm.
 
-Forwarded: no
-Last-Update: 2014-04-23
+Last-Update: 2015-09-26
+---
+ src/CMakeLists.txt | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
-Index: libfann-2.1.0~beta~dfsg/configure.in
-===================================================================
---- libfann-2.1.0~beta~dfsg.orig/configure.in	2014-04-23 02:04:47.842914729 +0200
-+++ libfann-2.1.0~beta~dfsg/configure.in	2014-04-23 02:04:47.838914838 +0200
-@@ -6,5 +6,7 @@
- AC_HEADER_STDC
- AC_C_CONST
- AC_HEADER_TIME
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
- AC_CHECK_FUNCS(gettimeofday)
- AC_OUTPUT(Makefile src/Makefile src/include/Makefile fann.pc fann.spec)
-Index: libfann-2.1.0~beta~dfsg/src/Makefile.am
-===================================================================
---- libfann-2.1.0~beta~dfsg.orig/src/Makefile.am	2014-04-23 02:04:47.842914729 +0200
-+++ libfann-2.1.0~beta~dfsg/src/Makefile.am	2014-04-23 02:04:47.838914838 +0200
-@@ -10,4 +10,9 @@
- libfixedfann_la_SOURCES = fixedfann.c
- libfann_la_SOURCES = floatfann.c
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 878d886..e7b0245 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -14,6 +14,9 @@ floatfann.c
+ ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS})
+ ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS})
  
-+libfloatfann_la_LIBADD = $(LIBM)
-+libdoublefann_la_LIBADD = $(LIBM)
-+libfixedfann_la_LIBADD = $(LIBM)
-+libfann_la_LIBADD = $(LIBM)
++TARGET_LINK_LIBRARIES(floatfann m)
++TARGET_LINK_LIBRARIES(floatfann_static m)
 +
- EXTRA_DIST = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c
+ SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
+ SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann)
+ INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} )
+@@ -29,6 +32,9 @@ doublefann.c
+ ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS})
+ ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS})
+ 
++TARGET_LINK_LIBRARIES(doublefann m)
++TARGET_LINK_LIBRARIES(doublefann_static m)
++
+ SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
+ SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann)
+ INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} )
+@@ -44,6 +50,9 @@ fixedfann.c
+ ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS})
+ ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS})
+ 
++TARGET_LINK_LIBRARIES(fixedfann m)
++TARGET_LINK_LIBRARIES(fixedfann_static m)
++
+ SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
+ SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann)
+ INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} )
+@@ -59,6 +68,9 @@ floatfann.c
+ ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS})
+ ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS})
+ 
++TARGET_LINK_LIBRARIES(fann m)
++TARGET_LINK_LIBRARIES(fann_static m)
++
+ SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
+ SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann)
+ INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} )

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