Date: Friday, June 5, 2020 @ 17:55:35 Author: arojas Revision: 639175
Update to 2.6.0 Modified: flint/trunk/PKGBUILD Deleted: flint/trunk/flint-pie-hardening-conflict.patch ------------------------------------+ PKGBUILD | 26 ++++++++++---------------- flint-pie-hardening-conflict.patch | 17 ----------------- 2 files changed, 10 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-05 17:19:50 UTC (rev 639174) +++ PKGBUILD 2020-06-05 17:55:35 UTC (rev 639175) @@ -3,30 +3,24 @@ # Contributor: Alessandro "jakedust" Andrioni <[email protected]> pkgname=flint -pkgver=2.5.2 -pkgrel=29 +pkgver=2.6.0 +pkgrel=1 pkgdesc="A C library for doing number theory" arch=(x86_64) url="http://www.flintlib.org"; license=(GPL) depends=(mpfr ntl) -source=("http://www.flintlib.org/flint-$pkgver.tar.gz"; flint-pie-hardening-conflict.patch) -sha256sums=('cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87' - '0e8ba7b48d70c703e511d71d4e59b6b359273c480b01f02879ca0aaaaa5395c3') +makedepends=(cmake python) +source=("http://www.flintlib.org/flint-$pkgver.tar.gz";) +sha256sums=('9089edadd12cbbda4533ab6f58efb7565fd973b5b82a89f53f64203bc3510840') -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 - make + cmake -B build -S $pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_NTL=ON + cmake --build build } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } Deleted: flint-pie-hardening-conflict.patch =================================================================== --- flint-pie-hardening-conflict.patch 2020-06-05 17:19:50 UTC (rev 639174) +++ flint-pie-hardening-conflict.patch 2020-06-05 17:55:35 UTC (rev 639175) @@ -1,17 +0,0 @@ -Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled -Author: Logan Rosen <[email protected]> -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) -
