aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Néri <dne+alpine@mayonnaise.net>2020-09-16 21:54:48 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2020-09-16 22:12:57 +0000
commit0a35bb84ec52c501790b6c2b8ca9ad32d849ad14 (patch)
treeefb3bcc9fbdd34c6e1535c77277facf155f55502
parent261f311a97a9b23bbb8e567d630ff319da735ba0 (diff)
downloadaports-0a35bb84ec52c501790b6c2b8ca9ad32d849ad14.tar.gz
aports-0a35bb84ec52c501790b6c2b8ca9ad32d849ad14.tar.bz2
aports-0a35bb84ec52c501790b6c2b8ca9ad32d849ad14.tar.xz
community/emacs: work around ppc64le hang during dump
Avoid calling out to git during dump.
-rw-r--r--community/emacs/APKBUILD11
-rw-r--r--community/emacs/no-git-repo.patch15
2 files changed, 21 insertions, 5 deletions
diff --git a/community/emacs/APKBUILD b/community/emacs/APKBUILD
index 5dc68c442f..dfe9d277ce 100644
--- a/community/emacs/APKBUILD
+++ b/community/emacs/APKBUILD
@@ -2,11 +2,10 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
pkgname=emacs
pkgver=27.1
-pkgrel=0
+pkgrel=1
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
# s390x, mips, mips64: librsvg
-# ppc64le: hang on build
-arch="all !s390x !mips !mips64 !ppc64le"
+arch="all !s390x !mips !mips64"
depends="emacs-nox"
url="https://www.gnu.org/software/emacs/emacs.html"
license="GPL-3.0-or-later"
@@ -16,7 +15,8 @@ makedepends="autoconf automake linux-headers paxmark gawk
libxml2-dev pango-dev tiff-dev libjpeg-turbo-dev ncurses-dev
ncurses-libs gnutls-dev libxaw-dev gmp-dev harfbuzz-dev jansson-dev"
subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2"
-source="https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz
+ no-git-repo.patch"
prepare() {
cd "$builddir/$1"
@@ -139,4 +139,5 @@ gtk2() {
_subpackage gtk2
}
-sha512sums="dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064 emacs-27.1.tar.xz"
+sha512sums="dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064 emacs-27.1.tar.xz
+5a2d1d10d66fd335b16d9f2d6d1e45e093067db87f8ef2d14a8c921cc94b3e226310c7cc691d19eb91eaf16de9ae4f20ff8be3596a4906b0514fa5f098328d97 no-git-repo.patch"
diff --git a/community/emacs/no-git-repo.patch b/community/emacs/no-git-repo.patch
new file mode 100644
index 0000000000..040f0e4bd0
--- /dev/null
+++ b/community/emacs/no-git-repo.patch
@@ -0,0 +1,15 @@
+Avoid calling out to git during dump - hangs on ppc64le.
+
+--- a/lisp/loadup.el 2020-07-27 23:21:49.000000000 +0200
++++ b/lisp/loadup.el 2020-09-16 21:50:13.919715162 +0200
+@@ -396,8 +396,8 @@
+ (string-to-number
+ (substring name (length base) exelen)))
+ files)))
+- (setq emacs-repository-version (ignore-errors (emacs-repository-get-version))
+- emacs-repository-branch (ignore-errors (emacs-repository-get-branch)))
++ ;; (setq emacs-repository-version (ignore-errors (emacs-repository-get-version))
++ ;; emacs-repository-branch (ignore-errors (emacs-repository-get-branch)))
+ ;; A constant, so we shouldn't change it with `setq'.
+ (defconst emacs-build-number
+ (if versions (1+ (apply 'max versions)) 1))))