commit 6fd322f7e99d762ac89a5a67ed53722c866d399c
Author: Jan Rękorajski <[email protected]>
Date: Mon Jun 24 14:47:21 2013 +0200
- force linking f77 lib with ssp, fixes undefined __stack_chk_fail on i486
- rel 10
plplot-link.patch | 15 +++++++++++++++
plplot.spec | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/plplot.spec b/plplot.spec
index 596bf6c..4576609 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -22,7 +22,7 @@ Summary: PLplot - a library of functions that are useful
for making scientific p
Summary(pl.UTF-8): PLplot - biblioteka funkcji przydatnych do tworzenia
wykresów naukowych
Name: plplot
Version: 5.9.9
-Release: 9
+Release: 10
License: LGPL v2+
Group: Libraries
Source0:
http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
diff --git a/plplot-link.patch b/plplot-link.patch
index 4a786d7..57b16e8 100644
--- a/plplot-link.patch
+++ b/plplot-link.patch
@@ -9,3 +9,18 @@
install(TARGETS csironn
EXPORT export_plplot
ARCHIVE DESTINATION ${LIB_DIR}
+--- plplot-5.9.9/bindings/f77/CMakeLists.txt.orig 2011-10-13
02:43:01.000000000 +0200
++++ plplot-5.9.9/bindings/f77/CMakeLists.txt 2013-06-24 14:36:00.674116925
+0200
+@@ -205,10 +205,10 @@
+
+ if(STATIC_OPTS)
+ add_library(plplotf77opts${LIB_TAG} STATIC
${plplotf77opts${LIB_TAG}_LIB_SRCS})
+- target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
++ target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG} ssp)
+ target_link_libraries(plplotf77opts${LIB_TAG} plplotf77${LIB_TAG}
plplotf77c${LIB_TAG})
+ else(STATIC_OPTS)
+- target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
++ target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG} ssp)
+ endif(STATIC_OPTS)
+
+ if(USE_RPATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/6fd322f7e99d762ac89a5a67ed53722c866d399c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
