* [PR PATCH] Aspell: force 32bit hash on all platforms
@ 2020-12-22 4:21 ericonr
2020-12-23 19:46 ` ericonr
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: ericonr @ 2020-12-22 4:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
There is a new 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: 6299 bytes --]
From d89a07bf4a58c723b0a39a58c10881bd5c5dd7a4 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.
[1] http://aspell.net/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
srcpkgs/aspell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..361418a060e 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,9 +1,9 @@
# Template file for 'aspell'
pkgname=aspell
version=0.60.8
-revision=2
+revision=3
build_style=gnu-configure
-configure_args="--enable-compile-in-filters"
+configure_args="--enable-compile-in-filters --enable-32-bit-hash-fun"
hostmakedepends="automake libtool gettext-devel perl"
makedepends="ncurses-devel"
depends="perl"
From da7f44b4d707e19355e21daf30d53ccc758f73bc 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 85360188619c7370b1adff5be6646d043d2759b8 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 7bf66b05c3e8ae497b5f7849d5b672fa0effd42b 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 f5800f16313d46013998d7150fada51dbf5465cf 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 dc2aea19eac91d310138acf8c49e68bcddab5b3f 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 4e5655aa7a7e2a6dfb00862865b1ce20d996ab63 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 bd484facf70fc095bcc2d6e62dee92e44c9972cf 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
@ 2020-12-23 19:46 ` ericonr
2020-12-26 21:37 ` [PR PATCH] [Updated] " ericonr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-23 19:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27342#issuecomment-750447310
Comment:
Since I haven't seen any complaints about this mismatch, I'm holding this change on upstream answering my query about allowing us to force 64bit hashes for all targets.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
2020-12-23 19:46 ` ericonr
@ 2020-12-26 21:37 ` ericonr
2020-12-26 22:05 ` ericonr
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-26 21:37 UTC (permalink / raw)
To: ml
[-- 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: 6466 bytes --]
From b0dfcf7a54ddf079033f394fa137ce4e039acb56 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 overkill [2].
[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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..361418a060e 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,9 +1,9 @@
# Template file for 'aspell'
pkgname=aspell
version=0.60.8
-revision=2
+revision=3
build_style=gnu-configure
-configure_args="--enable-compile-in-filters"
+configure_args="--enable-compile-in-filters --enable-32-bit-hash-fun"
hostmakedepends="automake libtool gettext-devel perl"
makedepends="ncurses-devel"
depends="perl"
From d3a8f0d7e581af6467564b36e0c01dde1bcdb377 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 134c7b854066db30619709b1528de0fea73b9934 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 82fa766a78ae6ea1e2ce0c59feb8fcccc9eecc0b 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 ef01a32e2f79593a195ca5a7fe79483f1475c929 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 fa134b1fce48e216de13d0b4b41a3a01a3c938af 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 7d8f80a1d8e2f0b1492f747a304c0ffcec0cb51e 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 7c569a5d74caf3b7325df67d2aa999cac3fad432 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
2020-12-23 19:46 ` ericonr
2020-12-26 21:37 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-26 22:05 ` ericonr
2020-12-26 22:12 ` ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-26 22:05 UTC (permalink / raw)
To: ml
[-- 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: 7029 bytes --]
From e7db509307b689ffd9724ed52a8ece017fd8d892 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..bf932c0abd0 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 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 --libdir=/usr/lib"
hostmakedepends="automake libtool gettext-devel perl"
makedepends="ncurses-devel"
depends="perl"
From af99fd58fe2fbc5ab0744d335f73b577d4b6f9d0 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 fea221d50c8d0a0e518da79d1b9db3b4b5350b2c 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 4410997b247a7e058c8f6eabe00f8f331d9163d5 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 29f47001efcdebb4aa0d36fe8f2afbe75db56967 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 8e1960bc20381ea373678a1a6097553235dff9a0 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 df0dff74d5de7d029c6e961db4dbc32aea9f2834 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 0264e23f08c8d19d282c273eb0ccdb2d4cf949e3 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
` (2 preceding siblings ...)
2020-12-26 22:05 ` ericonr
@ 2020-12-26 22:12 ` ericonr
2020-12-26 22:18 ` ericonr
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-26 22:12 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
` (3 preceding siblings ...)
2020-12-26 22:12 ` ericonr
@ 2020-12-26 22:18 ` ericonr
2020-12-26 23:05 ` ericonr
2020-12-28 1:31 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-26 22:18 UTC (permalink / raw)
To: ml
[-- 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: 7070 bytes --]
From 790bd89cd9b4f327f803485285fdf4eb5d8d76a5 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 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..3a7449450ab 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,9 +1,16 @@
# 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
+ --libdir=/usr/lib --enable-pkgdatadir=/usr/lib"
hostmakedepends="automake libtool gettext-devel perl"
makedepends="ncurses-devel"
depends="perl"
From 15c48fa648e68fd9a26fe13e31c69f1466463e23 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 f06c8160beebf3f58d2a0d209fd626a71976f448 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 b60ecc53c6bf326023c6ad53b7f85aba04095382 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 57f01ffc04e4548ba24fe1c507d2c6d772703449 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 7eb1e17529fa5094a6866ab470abc150c8993bc2 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 8e8eb35b62eed8bb5dac0133178a26f067bbfa23 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 47d4d2be70cfe31db12fd2cfbefe8b1b28e791af 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
` (4 preceding siblings ...)
2020-12-26 22:18 ` ericonr
@ 2020-12-26 23:05 ` ericonr
2020-12-28 1:31 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-26 23:05 UTC (permalink / raw)
To: ml
[-- 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: 8938 bytes --]
From 0d5e1fa1466a849eea0a408ecad777be299fc0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 20:02:15 -0300
Subject: [PATCH 1/9] environment/configure/gnu-configure: always include
configure_args from template last.
This makes sure that anything set in templates will override the
defaults.
---
common/environment/configure/gnu-configure-args.sh | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index 1c5f51b35cc..c0a2f4602b9 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -4,8 +4,12 @@ if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then
return 0
fi
+# Store args from template so they can be included last and override
+# our defaults
+TEMPLATE_CONFIGURE_ARGS="${configure_args}"
+
export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin
- --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var ${configure_args}"
+ --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
@@ -29,12 +33,18 @@ esac
# Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then
+ export configure_args+=" ${TEMPLATE_CONFIGURE_ARGS}"
+ unset TEMPLATE_CONFIGURE_ARGS
+
set +a
return 0
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+export configure_args+=" ${TEMPLATE_CONFIGURE_ARGS}"
+unset TEMPLATE_CONFIGURE_ARGS
+
# Read autoconf cache variables for cross target (taken from OE).
case "$XBPS_TARGET_MACHINE" in
# musl libc
From ae96f5add6bae085998d47a7fb27971ba109bc98 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 2/9] 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 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..f58c1832b9b 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,9 +1,16 @@
# 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
+ --libdir=/usr/lib"
hostmakedepends="automake libtool gettext-devel perl"
makedepends="ncurses-devel"
depends="perl"
From c031dbc419907f8d066817dee6afe25071e84128 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/9] 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 0c93eaea3376a24454e84df2858a7d411f6ac644 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/9] 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 3a9f2e8904c29ebba80da2cd16fb05c5822e9369 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/9] 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 d5274db002cbb03bb2842c8b2fe389850bf66c8f 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 6/9] 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 a9a2d42e49ba0e867650fce64b764b5b343c267c 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/9] 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 a051dc443c7292bbf2e0a1314f535b3f60a40185 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/9] 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 c65d92c568327ad5cc3dc37c9613613b2b97e46c 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 9/9] 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: Aspell: force 32bit hash on all platforms
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
` (5 preceding siblings ...)
2020-12-26 23:05 ` ericonr
@ 2020-12-28 1:31 ` ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-28 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
There's a merged pull request on the void-packages repository
Aspell: force 32bit hash on all platforms
https://github.com/void-linux/void-packages/pull/27342
Description:
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-28 1:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-22 4:21 [PR PATCH] Aspell: force 32bit hash on all platforms ericonr
2020-12-23 19:46 ` ericonr
2020-12-26 21:37 ` [PR PATCH] [Updated] " ericonr
2020-12-26 22:05 ` ericonr
2020-12-26 22:12 ` ericonr
2020-12-26 22:18 ` ericonr
2020-12-26 23:05 ` ericonr
2020-12-28 1:31 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).