build: align with overlay-patches policy + gnu-config + gettext fix
- .config: drop REDBEAR_RELEASE?=0.1.0 (was forcing offline)
- local/patches/gettext/01-external-gettext.patch (new): fix
AM_GNU_GETTEXT arg for autopoint 0.23.1+. autopoint now requires
'external' as first arg; gettext 0.22.5 used 'use-libtool'/'here'.
Patched 3 files: gettext-tools, gettext-runtime, gettext-runtime/intl.
- recipes/tools/gettext/01-external-gettext.patch (symlink): durable
source for the patch.
- recipes/tools/gettext/recipe.toml: fix source script for
gettext 0.22.5:
- Use /usr/share/aclocal (not /share/aclocal) — host sysroot is /.
- Create missing m4/ subdirs in every configure.ac-bearing dir
before autoreconf runs (newer aclocal needs them).
- src/cook/gnu-config/{config.sub,config.guess} (new): vendored
copies so that GNU_CONFIG_GET succeeds even when offline and
gitlab.redox-os.org is unreachable.
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
../../../local/patches/gettext/01-external-gettext.patch
|
||||||
@@ -4,17 +4,25 @@
|
|||||||
tar = "https://ftp.gnu.org/gnu/gettext/gettext-0.22.5.tar.gz"
|
tar = "https://ftp.gnu.org/gnu/gettext/gettext-0.22.5.tar.gz"
|
||||||
blake3 = "cb3f3a34da7ce1a92746df81f5b78c5d53841973a24eb80ab76537263d380ec0"
|
blake3 = "cb3f3a34da7ce1a92746df81f5b78c5d53841973a24eb80ab76537263d380ec0"
|
||||||
patches = [
|
patches = [
|
||||||
"redox.patch"
|
"redox.patch",
|
||||||
|
"01-external-gettext.patch"
|
||||||
]
|
]
|
||||||
script = """
|
script = """
|
||||||
DYNAMIC_INIT
|
DYNAMIC_INIT
|
||||||
GNU_CONFIG_GET build-aux/config.sub
|
GNU_CONFIG_GET build-aux/config.sub
|
||||||
( cd gettext-runtime/libasprintf && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
|
# Red Bear: gettext 0.22.5 expects m4/ dirs in every autoreconf-recursed
|
||||||
( cd gettext-runtime/intl && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
|
# subdir before autoreconf can run. Create them where missing.
|
||||||
( cd gettext-runtime && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
|
mkdir -p m4
|
||||||
( cd gettext-tools && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
|
find gettext-runtime gettext-tools libtextstyle -name configure.ac 2>/dev/null | while read ac; do
|
||||||
( cd libtextstyle && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
|
d="$(dirname "$ac")"
|
||||||
autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal
|
[ -d "$d/m4" ] || mkdir -p "$d/m4"
|
||||||
|
done
|
||||||
|
( cd gettext-runtime/libasprintf && autoreconf -fvi -I/usr/share/aclocal )
|
||||||
|
( cd gettext-runtime/intl && autoreconf -fvi -I/usr/share/aclocal )
|
||||||
|
( cd gettext-runtime && autoreconf -fvi -I/usr/share/aclocal )
|
||||||
|
( cd gettext-tools && autoreconf -fvi -I/usr/share/aclocal )
|
||||||
|
( cd libtextstyle && autoreconf -fvi -I/usr/share/aclocal )
|
||||||
|
autoreconf -fvi -I/usr/share/aclocal
|
||||||
"""
|
"""
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
|
|||||||
+1687
File diff suppressed because it is too large
Load Diff
+1851
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user