[Pkg-octave-commit] [SCM] octave branch, master, updated. 2ecbaa0375353921ac971b4af5a29887b828a0e1

[Thomas Weber]

tags 535080 pending
thanks

The following commit has been merged in the master branch:
commit cbcffa1e3050fc6f4db28dfe67aefdadb8bff8fb
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Thu Aug 20 11:08:23 2009 +0200

    Bug fix for #535080
    
    Patch taken from upstream

diff --git a/debian/changelog b/debian/changelog
index 72d6443..81b2aae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ octave3.2 (3.2.0-3) UNRELEASED; urgency=low
 
   [ Thomas Weber ]
   * New upstream release (closes: #541036)
+  * New patch: dont_pass_ldflags_to_magickconfig: don't pass magickconfig's
+    ldflags into MAGICK_LIBS (closes: #535080)
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 20 Jun 2009 19:16:45 +0200
 
diff --git a/debian/in/series b/debian/in/series
index dd12f8e..b8bec8a 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -14,4 +14,5 @@ no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
 complex-nan-print.diff
+dont_pass_ldflags_to_magickconfig
 :]
diff --git a/debian/patches/dont_pass_ldflags_to_magickconfig b/debian/patches/dont_pass_ldflags_to_magickconfig
new file mode 100644
index 0000000..582c6f4
--- /dev/null
+++ b/debian/patches/dont_pass_ldflags_to_magickconfig
@@ -0,0 +1,13 @@
+magickconfig includes a -pie switch in its ldflags, which is a problem
+Patch taken from upstream (db08c2376970), bug fix for 535080
+--- a/Makeconf.in
++++ b/Makeconf.in
+@@ -153,7 +153,7 @@
+ 
+ MAGICK_CONFIG = @MAGICK_CONFIG@
+ MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
+-MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs)
++MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs)
+ 
+ LIBFLAGS = -L$(TOPDIR)
+ 

-- 
octave