[code-saturne] 02/04: tag of version 2.1.0-4

[Gilles Filippini]

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

pini pushed a commit to annotated tag debian/2.1.0-4
in repository code-saturne.

commit b278a50c99c0d944b3e714c941fb920c15d95c4a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Jan 18 18:48:31 2012 +0000

     tag of version 2.1.0-4
---
 changelog               |  7 +++++++
 patches/as-needed.patch | 37 +++++++++++++++++++++++++++++++++++++
 patches/series          |  1 +
 3 files changed, 45 insertions(+)

diff --git a/changelog b/changelog
index b21f4c5..821a6c4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+code-saturne (2.1.0-4) unstable; urgency=low
+
+  * Fix a as-needed issue. Thanks to Ilya Barygin for the patch
+    (Closes: #651672)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 11 Dec 2011 19:26:58 +0100
+
 code-saturne (2.1.0-3) unstable; urgency=low
 
   * Install a missing file
diff --git a/patches/as-needed.patch b/patches/as-needed.patch
new file mode 100644
index 0000000..291dfc7
--- /dev/null
+++ b/patches/as-needed.patch
@@ -0,0 +1,37 @@
+Description: fix FTBFS with ld --as-needed option
+ -lm should be added to LDADD, not LDFLAGS. This way it's put after object
+ files when invoking linker
+Author: Ilya Barygin <randomaction at ubuntu.com>
+--- code-saturne-2.1.0.orig/src/apps/Makefile.am
++++ code-saturne-2.1.0/src/apps/Makefile.am
+@@ -147,10 +147,10 @@ cs_check_syntax_CPPFLAGS = \
+ cs_check_syntax_SOURCES = cs_check_syntax.c
+ cs_check_syntax_LDADD = \
+ $(top_builddir)/src/mei/libmei.la \
+-$(top_builddir)/src/bft/libbft.la
+-cs_check_syntax_LDFLAGS = \
+-$(ORIGINRUNPATH) \
++$(top_builddir)/src/bft/libbft.la \
+ -lm
++cs_check_syntax_LDFLAGS = \
++$(ORIGINRUNPATH)
+ 
+ endif
+ 
+--- code-saturne-2.1.0.orig/src/apps/Makefile.in
++++ code-saturne-2.1.0/src/apps/Makefile.in
+@@ -637,11 +637,11 @@ $(FCLIBS)
+ @HAVE_FRONTEND_TRUE at cs_check_syntax_SOURCES = cs_check_syntax.c
+ @HAVE_FRONTEND_TRUE at cs_check_syntax_LDADD = \
+ @HAVE_FRONTEND_TRUE@$(top_builddir)/src/mei/libmei.la \
+- at HAVE_FRONTEND_TRUE@$(top_builddir)/src/bft/libbft.la
++ at HAVE_FRONTEND_TRUE@$(top_builddir)/src/bft/libbft.la \
++ at HAVE_FRONTEND_TRUE@-lm
+ 
+ @HAVE_FRONTEND_TRUE at cs_check_syntax_LDFLAGS = \
+- at HAVE_FRONTEND_TRUE@$(ORIGINRUNPATH) \
+- at HAVE_FRONTEND_TRUE@-lm
++ at HAVE_FRONTEND_TRUE@$(ORIGINRUNPATH)
+ 
+ 
+ # Code_Saturne partitioner
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..7477eeb
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+as-needed.patch

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