summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2019-07-28 15:06:05 -0500
committerPedro A. López-Valencia2019-07-28 15:06:05 -0500
commit17888830a3aa87288162e3db028571befc35138c (patch)
treea437242b5c39df668eaef9e9557df1ac694d4daf
parentd8d630f23af5cedc0d41751083777dba90c913ca (diff)
downloadaur-17888830a3aa87288162e3db028571befc35138c.tar.gz
More fixups.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD13
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 28455eb007b0..b204a3a55348 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development.
pkgver = 27.0.50.137787
- pkgrel = 1
+ pkgrel = 2
url = http://www.gnu.org/software/emacs/
arch = x86_64
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 5612f7c8e8f0..ed7754547e5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -55,7 +55,7 @@ NOGZ= # Don't compress el files.
################################################################################
pkgname="emacs-git"
pkgver=27.0.50.137787
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Emacs. Development."
arch=('x86_64') # Arch Linux only. Users of derivatives are on their own.
url="http://www.gnu.org/software/emacs/"
@@ -69,10 +69,15 @@ if [[ $LTO = "YES" ]]; then
CLANG="YES" ;
fi
+if [[ $CLI = "YES" ]]; then
+ GPM="YES" ;
+fi
+
if [[ $CLANG = "YES" ]]; then
export CC="/usr/bin/clang" ;
export CXX="/usr/bin/clang++" ;
export CPP="/usr/bin/clang -E" ;
+ export LD="/usr/bin/lld" ;
export LDFLAGS+=' -fuse-ld=lld' ;
makedepends+=( 'clang' 'lld') ;
fi
@@ -209,12 +214,10 @@ if [[ ! $M17N = "YES" ]]; then
fi
if [[ $MAGICK = "YES" ]]; then
- _conf+=(
- '--with-imagemagick'
- );
+ _conf+=( '--with-imagemagick');
export PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig
else
- _conf+=( '--without-imagemagick' );
+ _conf+=();
fi
if [[ $CAIRO = "YES" ]]; then