r44390 - in /packages/code-saturne/trunk/debian: changelog patches/as-needed.patch patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Wed Jan 18 18:48:05 2012
New Revision: 44390

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44390
Log:
code-saturne (2.1.0-4) unstable; urgency=low

  * Fix a as-needed issue. Thanks to Ilya Barygin for the patch
    (Closes: #651672)

Added:
    packages/code-saturne/trunk/debian/patches/as-needed.patch
    packages/code-saturne/trunk/debian/patches/series
Modified:
    packages/code-saturne/trunk/debian/changelog

Modified: packages/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/changelog?rev=44390&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog (original)
+++ packages/code-saturne/trunk/debian/changelog Wed Jan 18 18:48:05 2012
@@ -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

Added: packages/code-saturne/trunk/debian/patches/as-needed.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/patches/as-needed.patch?rev=44390&op=file
==============================================================================
--- packages/code-saturne/trunk/debian/patches/as-needed.patch (added)
+++ packages/code-saturne/trunk/debian/patches/as-needed.patch Wed Jan 18 18:48:05 2012
@@ -1,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

Added: packages/code-saturne/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/patches/series?rev=44390&op=file
==============================================================================
--- packages/code-saturne/trunk/debian/patches/series (added)
+++ packages/code-saturne/trunk/debian/patches/series Wed Jan 18 18:48:05 2012
@@ -1,0 +1,1 @@
+as-needed.patch