[clapack] 03/04: Adapt patches to removed f2c code copy

[Andreas Tille]

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

tille pushed a commit to branch master
in repository clapack.

commit d5c51e539e7e7857f19b041b5b813aeb1a10dc53
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 26 17:49:02 2016 +0200

    Adapt patches to removed f2c code copy
---
 debian/patches/create_shared_libs.patch | 10 ----------
 debian/patches/format-security.patch    | 24 ------------------------
 debian/patches/series                   |  1 -
 3 files changed, 35 deletions(-)

diff --git a/debian/patches/create_shared_libs.patch b/debian/patches/create_shared_libs.patch
index be9b66a..8017d24 100644
--- a/debian/patches/create_shared_libs.patch
+++ b/debian/patches/create_shared_libs.patch
@@ -19,16 +19,6 @@ Description: Create shared and static libraries.
  endif()
 -target_link_libraries(blas f2c)
 +target_link_libraries(cblas f2c)
---- a/F2CLIBS/libf2c/CMakeLists.txt
-+++ b/F2CLIBS/libf2c/CMakeLists.txt
-@@ -58,5 +58,6 @@ if(WIN32)
- endif()
- include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
- include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
--add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
-+add_library(f2c SHARED ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
-+add_library(f2cstatic STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
- set_property(TARGET f2c PROPERTY PREFIX lib)
 --- a/SRC/CMakeLists.txt
 +++ b/SRC/CMakeLists.txt
 @@ -375,6 +375,7 @@ endif()
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index a1539b8..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Andreas Tille
-Last-Update: Sat, 21 May 2016 09:41:25 +0200
-Description: Test breaks format security and should be fullfilled on Linux anyway.
- See discussion on debian-mentors list in May 2016 starting at
-   https://lists.debian.org/debian-mentors/2016/05/msg00386.html
-
---- a/F2CLIBS/libf2c/arithchk.c
-+++ b/F2CLIBS/libf2c/arithchk.c
-@@ -122,6 +122,7 @@ ccheck(void)
- 	long Cray1;
- 
- 	/* Cray1 = 4617762693716115456 -- without overflow on non-Crays */
-+/* Skip useless test
- 	Cray1 = printf(emptyfmt) < 0 ? 0 : 4617762;
- 	if (printf(emptyfmt, Cray1) >= 0)
- 		Cray1 = 1000000*Cray1 + 693716;
-@@ -130,6 +131,7 @@ ccheck(void)
- 	u.d = 1e13;
- 	if (u.L == Cray1)
- 		return &CRAY;
-+*/
- 	return 0;
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 96e77fc..42e1777 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-format-security.patch
 skip_tests_triggering_stack_overflow.patch
 create_shared_libs.patch
 soname.patch

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