The following commit has been merged in the master branch:
commit 4bb6d1091800be869ea19e4ee5f46bfbc0ca4797
Author: Antonio Valentino <antonio.valent...@tiscali.it>
Date:   Wed Aug 14 07:52:40 2013 +0000

    Better fix for missing link with libm

diff --git a/debian/changelog b/debian/changelog
index 48fdb3b..058055a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
       because applied upstream
     - new patch for generating the static library
     - new patch for setting the SOVERSION
-    - new patch for linking test programs with libm
+    - new patch for fixing missing linkage with libm
   * Set compat to 9
 
  -- Antonio Valentino <antonio.valent...@tiscali.it>  Tue, 13 Aug 2013 
15:20:14 +0000
diff --git a/debian/patches/0003-Add-missing-link-target.patch 
b/debian/patches/0003-Add-missing-link-target.patch
new file mode 100644
index 0000000..19a9e5c
--- /dev/null
+++ b/debian/patches/0003-Add-missing-link-target.patch
@@ -0,0 +1,30 @@
+From: Antonio Valentino <antonio.valent...@tiscali.it>
+Date: Tue, 13 Aug 2013 17:47:13 +0000
+Subject: Add missing link target
+
+---
+ src/CMakeLists.txt      | 1 +
+ src/test/CMakeLists.txt | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9af5837..d09178d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,6 +27,7 @@ add_library(epr_api SHARED ${SOURCES})
+ set_target_properties(epr_api PROPERTIES
+     VERSION 
"${EPR_API_VERSION_MAJOR}.${EPR_API_VERSION_MINOR}.${EPR_API_VERSION_PATCH}"
+     SOVERSION ${EPR_API_VERSION_MAJOR})
++target_link_libraries(epr_api m)
+ 
+ 
+ if(BUILD_STATIC_LIB)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index d33d6f5..ca3a5fa 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -30,4 +30,3 @@ endif(${BIGENDIAN})
+ add_test(TEST_EPR_03 epr_test_endian)
+ set_tests_properties(TEST_EPR_03 PROPERTIES PASS_REGULAR_EXPRESSION
+     ${ENDIANESS})
+-
diff --git a/debian/patches/0003-Link-test-programs-with-libm.patch 
b/debian/patches/0003-Link-test-programs-with-libm.patch
deleted file mode 100644
index bf2e941..0000000
--- a/debian/patches/0003-Link-test-programs-with-libm.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Antonio Valentino <antonio.valent...@tiscali.it>
-Date: Tue, 13 Aug 2013 17:47:13 +0000
-Subject: Link test programs with libm
-
----
- debian/changelog            | 3 ++-
- src/api-test/CMakeLists.txt | 2 +-
- src/test/CMakeLists.txt     | 2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/api-test/CMakeLists.txt b/src/api-test/CMakeLists.txt
-index 5f18494..e0d3bd8 100644
---- a/src/api-test/CMakeLists.txt
-+++ b/src/api-test/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # Copyright (c) 2013 Antonio Valentino <antonio.valent...@tiscali.it>
- 
- add_executable(api_tests api_tests.c)
--target_link_libraries(api_tests epr_api)
-+target_link_libraries(api_tests epr_api m)
- 
- #add_test(TEST_API_02 api_tests)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index d33d6f5..e16db6b 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(TARGETS api_unit_tests
- 
- foreach(TEST ${TARGETS})
-     add_executable(${TEST} ${TEST}.c)
--    target_link_libraries(${TEST} epr_api)
-+    target_link_libraries(${TEST} epr_api m)
- endforeach(TEST)
- 
- target_link_libraries(epr_main_test bccunit)
diff --git a/debian/patches/series b/debian/patches/series
index fa8e344..b63010f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0001-static-lib.patch
 0002-Set-SOVERSION.patch
-0003-Link-test-programs-with-libm.patch
+0003-Add-missing-link-target.patch

-- 
ENVISAT Product Reader API for C

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to