Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages aspell
https://github.com/void-linux/void-packages/pull/27342

Aspell: force 32bit hash on all platforms
See https://github.com/void-linux/void-packages/issues/16659

The other solutions are either

- an aspell-32bit-compat package to cross build for 32bit archs on 64bit host
- adding plumbing around all dictionary packages to use qemu (which will break next time someone adds a dictionary)

Since neither of those are great, I went with the simplest one.

A patch file from https://github.com/void-linux/void-packages/pull/27342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aspell-27342.patch --]
[-- Type: text/x-diff, Size: 7042 bytes --]

From b95cac9375cd785bf7570f846d761542fbbf3546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:12:51 -0300
Subject: [PATCH 1/8] aspell: force 32-bit dictionaries for all archs.

Given [1] and that we cross build dictionary packages for 32bit archs on
64bit hosts, the generated dictionaries aren't usable on the 32bit
systems. It is therefore necessary to compile aspell in its 32bit mode,
which will make it possible to cross build dictionaries between
supported architectures, as long as they have the same endianness.

Furthermore, upstream recommends using 32bit hashes, since the 64bit
ones are completely unnecessary [2].

It should be noted that dictionaries were previously completely broken
for 32-bit cross compiled targets (currently, arvm6l and armv7l).

[1] http://aspell.net/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
[2] https://lists.gnu.org/archive/html/aspell-devel/2020-12/msg00001.html
---
 srcpkgs/aspell/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..f839f50140b 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,9 +1,15 @@
 # Template file for 'aspell'
 pkgname=aspell
 version=0.60.8
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-compile-in-filters"
+# we need to force aspell to use /usr/lib for data for two reasons:
+# - in multilib systems, it should use the native dicts instead of requiring
+#   that a dict be installed twice
+# - when cross compiling packages, it's aspell that determines where the dicts
+#   are to be installed; the build will error out if it tries to install the
+#   dictionaries into /usr/lib64 for 32-bit targets
+configure_args="--enable-compile-in-filters --enable-32-bit-hash-fun --pkgdatadir=/usr/lib"
 hostmakedepends="automake libtool gettext-devel perl"
 makedepends="ncurses-devel"
 depends="perl"

From 8942225b6163425287fca8b19a07404f5b9cbc4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:32 -0300
Subject: [PATCH 2/8] aspell-ru: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-ru/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template
index c6592338f38..abdcf8f050c 100644
--- a/srcpkgs/aspell-ru/template
+++ b/srcpkgs/aspell-ru/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-ru'
 pkgname=aspell-ru
 version=0.99f7
-revision=3
+revision=4
 wrksrc="aspell6-ru-${version}-1"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 8a99f316596ed52b175cb0260936c6c7fdcae4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:32 -0300
Subject: [PATCH 3/8] aspell-de: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-de/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-de/template b/srcpkgs/aspell-de/template
index 029664409c5..be8905b0299 100644
--- a/srcpkgs/aspell-de/template
+++ b/srcpkgs/aspell-de/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-de'
 pkgname=aspell-de
 version=20161207.7.0
-revision=2
+revision=3
 wrksrc="aspell6-de-${version//./-}"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 7aefafe8d682d8568cef09d23a27835c85898003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:32 -0300
Subject: [PATCH 4/8] aspell-el: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-el/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-el/template b/srcpkgs/aspell-el/template
index 7d4a9c2727f..1221a64c823 100644
--- a/srcpkgs/aspell-el/template
+++ b/srcpkgs/aspell-el/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-el'
 pkgname=aspell-el
 version=0.08.0
-revision=2
+revision=3
 _distver="${version%.*}-${version##*.}"
 wrksrc="aspell6-el-${_distver}"
 build_style=configure

From f4d1e5ad107180b0ecb790b7342088a052b1dbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:32 -0300
Subject: [PATCH 5/8] aspell-fr: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-fr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-fr/template b/srcpkgs/aspell-fr/template
index 970e6041401..e563f3a91e8 100644
--- a/srcpkgs/aspell-fr/template
+++ b/srcpkgs/aspell-fr/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-fr'
 pkgname=aspell-fr
 version=0.50.3
-revision=3
+revision=4
 wrksrc="aspell-fr-0.50-3"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 4e1c7be2d5d5b3672cc7d005a74c22fa9b0464ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:33 -0300
Subject: [PATCH 6/8] aspell-en: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-en/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template
index 87ac85d00ea..7b6ca841eaf 100644
--- a/srcpkgs/aspell-en/template
+++ b/srcpkgs/aspell-en/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-en'
 pkgname=aspell-en
 version=2020.12.07
-revision=1
+revision=2
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 042e059f526af22d617e4a8058b9853cc030c38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:33 -0300
Subject: [PATCH 7/8] aspell-cs: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-cs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-cs/template b/srcpkgs/aspell-cs/template
index 35958546170..a5ff4a773d2 100644
--- a/srcpkgs/aspell-cs/template
+++ b/srcpkgs/aspell-cs/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-cs'
 pkgname=aspell-cs
 version=20040614.1
-revision=2
+revision=3
 wrksrc="aspell6-cs-${version/./-}"
 build_style=configure
 hostmakedepends="aspell-devel which"

From c405378ff77b514c0dcce54f83638179dc98d3ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 01:19:33 -0300
Subject: [PATCH 8/8] aspell-pl: rebuild for forced 32bit hash function in
 aspell.

---
 srcpkgs/aspell-pl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template
index a0600b785c9..05d90c0033b 100644
--- a/srcpkgs/aspell-pl/template
+++ b/srcpkgs/aspell-pl/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-pl'
 pkgname=aspell-pl
 version=20061121
-revision=2
+revision=3
 wrksrc="aspell6-pl-6.0_${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel which"