[flint] 02/04: Added a patch from Logan Rosen to fix FTBFS with PIE enabled (Closes: #837453)

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository flint.

commit 06e76124fc2d635665928400a5e5155a218bd751
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Fri Oct 28 11:58:31 2016 +0200

    Added a patch from Logan Rosen to fix FTBFS with PIE enabled (Closes: #837453)
---
 Makefile.subdirs               |  2 +-
 debian/changelog               |  6 ++++++
 debian/patches/PIE-FTBFS.patch | 17 +++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Makefile.subdirs b/Makefile.subdirs
index ec05fb0..f2d8b37 100644
--- a/Makefile.subdirs
+++ b/Makefile.subdirs
@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
 
 $(MOD_LOBJ): $(LOBJS)
-	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
+	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
 
 -include $(LOBJS:.lo=.d)
 
diff --git a/debian/changelog b/debian/changelog
index 2809857..0700143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+flint (2.5.2-10) UNRELEASED; urgency=medium
+
+  * Added a patch by Logan Rosen to fix a FTBFS issue. (Closes: #837453)
+
+ -- Julien Puydt <julien.puydt at laposte.net>  Fri, 28 Oct 2016 11:56:41 +0200
+
 flint (2.5.2-9) unstable; urgency=medium
 
   * Added a patch from Dejan Latinovic to fix a MIPS issue. (Closes: #836304)
diff --git a/debian/patches/PIE-FTBFS.patch b/debian/patches/PIE-FTBFS.patch
new file mode 100644
index 0000000..5689e36
--- /dev/null
+++ b/debian/patches/PIE-FTBFS.patch
@@ -0,0 +1,17 @@
+Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen <logan at ubuntu.com>
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index ec05fb0..f2d8b37 100644
+--- a/Makefile.subdirs
++++ b/Makefile.subdirs
+@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+ 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+ 
+ $(MOD_LOBJ): $(LOBJS)
+-	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+ 
+ -include $(LOBJS:.lo=.d)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 67a04c1..841e533 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fixed-latex-manual-compilation.patch
 hurd
 use_clz_builtins_for_mips.patch
+PIE-FTBFS.patch

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