Date: Friday, July 7, 2017 @ 18:01:07 Author: arojas Revision: 242976
ntl 10.5 rebuild Added: flint/trunk/flint-pie-hardening-conflict.patch Modified: flint/trunk/PKGBUILD ------------------------------------+ PKGBUILD | 13 ++++- flint-pie-hardening-conflict.patch | 78 +++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-07 17:59:45 UTC (rev 242975) +++ PKGBUILD 2017-07-07 18:01:07 UTC (rev 242976) @@ -5,15 +5,22 @@ pkgname=flint pkgver=2.5.2 -pkgrel=18 +pkgrel=19 pkgdesc="A C library for doing number theory" arch=(i686 x86_64) url="http://www.flintlib.org"; license=(GPL) depends=(mpfr ntl) -source=("http://www.flintlib.org/flint-$pkgver.tar.gz";) -md5sums=('cda885309362150196aed66a5e0f0383') +source=("http://www.flintlib.org/flint-$pkgver.tar.gz"; flint-pie-hardening-conflict.patch) +sha256sums=('cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87' + '2266dcd423b95a144d94e667ce3a9204401fa3577767ecceeb658f281072ccc5') +prepare() { + cd $pkgname-$pkgver +# Fix build with PIE + patch -p1 -i ../flint-pie-hardening-conflict.patch +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-ntl=/usr Added: flint-pie-hardening-conflict.patch =================================================================== --- flint-pie-hardening-conflict.patch (rev 0) +++ flint-pie-hardening-conflict.patch 2017-07-07 18:01:07 UTC (rev 242976) @@ -0,0 +1,78 @@ +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 + +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 @@ + $(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) + +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 $@
