[arch-commits] Commit in ecl/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, June 28, 2020 @ 09:55:37
  Author: arojas
Revision: 390536

Backport crash fix for sagemath, quote variables

Modified:
  ecl/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-28 09:45:05 UTC (rev 390535)
+++ PKGBUILD	2020-06-28 09:55:37 UTC (rev 390536)
@@ -3,7 +3,7 @@
 
 pkgname=ecl
 pkgver=20.4.24 # Remember to rebuild sagemath when the soname changes 
-pkgrel=1
+pkgrel=2
 pkgdesc="Embeddable Common Lisp"
 arch=('x86_64')
 url="https://common-lisp.net/project/ecl/"
@@ -12,18 +12,21 @@
 makedepends=('texinfo')
 provides=('common-lisp' 'cl-asdf')
 options=('!makeflags')
-source=("https://common-lisp.net/project/ecl/static/files/release/${pkgname}-${pkgver}.tgz")
-sha256sums=('670838edf258a936b522fdb620da336de7e575aa0d27e34841727252726d0f07')
+source=("https://common-lisp.net/project/ecl/static/files/release/${pkgname}-${pkgver}.tgz"
+         https://gitlab.com/embeddable-common-lisp/ecl/-/commit/75877dd8.patch)
+sha256sums=('670838edf258a936b522fdb620da336de7e575aa0d27e34841727252726d0f07'
+            '2c4896efc51114c0db0c0203a57379b3f1407e1107bf3443fe956d358221292c')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
+  patch -p1 -i ../75877dd8.patch # Fix segfaults in sagemath
   # upstream patch: https://gitlab.com/sagemath/dev/trac/-/commit/ed7bc14f751a76ad88c506cd33beb7f3e1030ff5
   sed -i "s/FFI_SYSV/FFI_UNIX64/" src/c/ffi.d
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   sed -i 's|-Wl,--rpath,~A|-Wl,--rpath,/usr/lib/ecl|' src/configure
   CFLAGS+=" -fcommon"
   ./configure \
@@ -43,5 +46,5 @@
 }
 
 package() {
-  make -C $srcdir/$pkgname-$pkgver DESTDIR=$pkgdir install
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
 }