[arch-commits] Commit in flint/trunk (PKGBUILD flint-pie-hardening-conflict.patch)

[Antonio Rojas]

    Date: Sunday, July 15, 2018 @ 18:45:19
  Author: arojas
Revision: 359568

ntl 11.2.1 rebuild

Modified:
  flint/trunk/PKGBUILD
  flint/trunk/flint-pie-hardening-conflict.patch

------------------------------------+
 PKGBUILD                           |    4 -
 flint-pie-hardening-conflict.patch |   77 +++--------------------------------
 2 files changed, 10 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-15 18:29:34 UTC (rev 359567)
+++ PKGBUILD	2018-07-15 18:45:19 UTC (rev 359568)
@@ -5,7 +5,7 @@
 
 pkgname=flint
 pkgver=2.5.2
-pkgrel=23
+pkgrel=24
 pkgdesc="A C library for doing number theory"
 arch=(x86_64)
 url="http://www.flintlib.org"
@@ -13,7 +13,7 @@
 depends=(mpfr ntl)
 source=("http://www.flintlib.org/flint-$pkgver.tar.gz" flint-pie-hardening-conflict.patch)
 sha256sums=('cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87'
-            '2266dcd423b95a144d94e667ce3a9204401fa3577767ecceeb658f281072ccc5')
+            '0e8ba7b48d70c703e511d71d4e59b6b359273c480b01f02879ca0aaaaa5395c3')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: flint-pie-hardening-conflict.patch
===================================================================
--- flint-pie-hardening-conflict.patch	2018-07-15 18:29:34 UTC (rev 359567)
+++ flint-pie-hardening-conflict.patch	2018-07-15 18:45:19 UTC (rev 359568)
@@ -1,36 +1,12 @@
-In newer binutils, ld options -r and -pie conflict.
-Patch due to Jörg-Volker Peetz
-(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ),
-packaged by Emmanuel Charpentier
+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 -ru flint-2.5.2-orig/fq/Makefile flint-2.5.2-new/fq/Makefile
---- flint-2.5.2-orig/fq/Makefile	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/fq/Makefile	2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- 	$(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
- 	$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/fq_poly/Makefile flint-2.5.2-new/fq_poly/Makefile
---- flint-2.5.2-orig/fq_poly/Makefile	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/fq_poly/Makefile	2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- 	$(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
- 	$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/Makefile.subdirs flint-2.5.2-new/Makefile.subdirs
---- flint-2.5.2-orig/Makefile.subdirs	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/Makefile.subdirs	2016-11-07 18:41:09.144996522 +0100
-@@ -59,7 +59,7 @@
+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)
@@ -39,40 +15,3 @@
  
  -include $(LOBJS:.lo=.d)
  
-Seulement dans flint-2.5.2-new/: Makefile.subdirs.orig
-diff -ru flint-2.5.2-orig/padic_mat/Makefile flint-2.5.2-new/padic_mat/Makefile
---- flint-2.5.2-orig/padic_mat/Makefile	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/padic_mat/Makefile	2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- 	$(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
- 	$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/padic_poly/Makefile flint-2.5.2-new/padic_poly/Makefile
---- flint-2.5.2-orig/padic_poly/Makefile	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/padic_poly/Makefile	2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- 	$(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
- 	$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/qadic/Makefile flint-2.5.2-new/qadic/Makefile
---- flint-2.5.2-orig/qadic/Makefile	2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/qadic/Makefile	2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- 	$(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
- 	$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@