[gnuplot5] 01/01: Don`t build with -fPIE. (Closes: #795076)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot5.

commit 3025d4a21e6520df24ccb6bdb4e439099e7866c2
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Aug 11 22:10:33 2015 +0200

    Don`t build with -fPIE. (Closes: #795076)
---
 debian/changelog               | 12 ++++++++++++
 debian/patches/13_no_pie.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  5 ++++-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 89a6fb9..6d48a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gnuplot5 (5.0.1+dfsg1-3) unstable; urgency=medium
+
+  [ Martin Pitt <martin.pitt at ubuntu.com> ]
+  * Add 13_no_pie.patch: Don't build with -fPIE, Qt barfs on that with
+    gcc >= 5. (http://code.qt.io/cgit/qt/qtbase.git/commit/?id=3eca75d)
+    (Closes: #795076)
+  * debian/rules: Also drop "pie" from hardening flags. Instead, build with
+    -fPIC; it's conceptually wrong, but it's what the above Qt check insists
+    on.
+
+ -- Anton Gladky <gladk at debian.org>  Tue, 11 Aug 2015 22:07:13 +0200
+
 gnuplot5 (5.0.1+dfsg1-2) unstable; urgency=medium
 
   [ Vincent Lefevre ]
diff --git a/debian/patches/13_no_pie.patch b/debian/patches/13_no_pie.patch
new file mode 100644
index 0000000..b5148ba
--- /dev/null
+++ b/debian/patches/13_no_pie.patch
@@ -0,0 +1,28 @@
+Description: Don't build with -fPIE, Qt barfs on that with gcc >= 5. (http://code.qt.io/cgit/qt/qtbase.git/commit/?id=3eca75d)
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/795076
+
+Index: gnuplot5-5.0.1+dfsg1/configure
+===================================================================
+--- gnuplot5-5.0.1+dfsg1.orig/configure
++++ gnuplot5-5.0.1+dfsg1/configure
+@@ -14238,7 +14238,6 @@ fi
+         RCC=${QT5LOC}/rcc
+         LRELEASE=${QT5LOC}/lrelease
+       fi
+-      CXXFLAGS="$CXXFLAGS -fPIE"
+     fi
+   fi
+ 
+Index: gnuplot5-5.0.1+dfsg1/configure.in
+===================================================================
+--- gnuplot5-5.0.1+dfsg1.orig/configure.in
++++ gnuplot5-5.0.1+dfsg1/configure.in
+@@ -1208,7 +1208,6 @@ if test "${enable_qt}" = yes ; then
+         RCC=${QT5LOC}/rcc
+         LRELEASE=${QT5LOC}/lrelease
+       fi
+-      CXXFLAGS="$CXXFLAGS -fPIE"
+     fi 
+   fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 519eb43..5820487 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 10_removepicins.patch
 11_fix_linkage_wx.patch
 12_info.patch
+13_no_pie.patch
diff --git a/debian/rules b/debian/rules
index 4c9fd5a..d338675 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 %:
 	dh $@ --parallel --with autoreconf
 
-export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Tell compiler where should find lua headers
@@ -12,6 +12,9 @@ export DEB_CFLAGS_MAINT_APPEND = -I/usr/include/lua5.1
 # Force the use of qt5
 export QT_SELECT=qt5
 
+# Qt insists on using -fPIC
+export DEB_CXXFLAGS_MAINT_APPEND = -fPIC
+
 BUILDDIR_NOX = $(CURDIR)/debian/build-nox
 BUILDDIR_X11 = $(CURDIR)/debian/build-x11
 BUILDDIR_QT = $(CURDIR)/debian/build-qt

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