disable hardening-wrapper PIE

2 files changed, 8 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03d413580499..df1330ecef02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = emacs-lucid
 	pkgdesc = The extensible, customizable, self-documenting real-time display editor (Lucid toolkit version)
 	pkgver = 25.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.gnu.org/software/emacs/emacs.html
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 95dbf7d55596..aae3a7b0bb53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=emacs-lucid
 pkgver=25.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The extensible, customizable, self-documenting real-time display editor (Lucid toolkit version)"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -22,10 +22,16 @@ md5sums=('4f3d42fb22823a659e16bfa89078a74c'
 
 build() {
   cd "$srcdir"/emacs-$pkgver
+
+  # For the hardening-wrapper package.  Emacs doesn't support building
+  # with PIE (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18784).
+  export HARDENING_PIE=0
+
   ./configure \
       --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --localstatedir=/var \
       --with-x-toolkit=lucid --with-xft --without-gconf --without-gsettings \
       --with-gameuser=:games --program-transform-name='s/^ctags$/ctags.emacs/'
+
   make
 }