From 4d6e265dc350af1849b60ce2c97d839b4d156306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Thu, 9 Sep 2021 19:46:47 +0200
Subject: Don't copy etc/config.guess for binutils{,_*}.

etc/README.md: updated.
midipix.env:${DEFAULT_BUILD_VARS}: adds AUTOCONF_CONFIG_GUESS.
groups/010.host_deps.group:binutils_build:${PKG_PATCHES_EXTRA}: from chainport (via midipix.)
patches/binutils_build-2.24.51.local.patch: from patches/binutils-2.24.51.local.patch (via midipix.)
subr/pkg_configure_autotools.subr: copy etc/config.guess according to ${PKG_AUTOCONF_CONFIG_GUESS}.
---
 groups/010.host_deps.group        | 2 ++
 groups/030.host_toolchain.group   | 2 ++
 groups/110.native_toolchain.group | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'groups')

diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index d9e44a14..05392d37 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -23,8 +23,10 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_BINUTILS_BUILD_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_BUILD_VERSION:=2.24.51};
 : ${PKG_BINUTILS_BUILD_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_BUILD_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_BUILD_AUTOCONF_CONFIG_GUESS:="keep"};
 : ${PKG_BINUTILS_BUILD_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --enable-install-libbfd --prefix=${PREFIX}/opt"};
 : ${PKG_BINUTILS_BUILD_LIBTOOL:=slibtool-static};
+: ${PKG_BINUTILS_BUILD_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_BUILD_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_BUILD_PREFIX:="${PREFIX}/opt"};
 : ${PKG_BINUTILS_BUILD_VARS_FILE:="vars/binutils.vars"};
 : ${PKG_BISON_HOST_DEPENDS:="readline_host"};
diff --git a/groups/030.host_toolchain.group b/groups/030.host_toolchain.group
index 09bf01d6..59ccae72 100644
--- a/groups/030.host_toolchain.group
+++ b/groups/030.host_toolchain.group
@@ -15,6 +15,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_HOST_AUTOCONF_CONFIG_GUESS:="keep"};
 : ${PKG_BINUTILS_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -g2 -O0"};
 : ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=${DEFAULT_TARGET} --with-sysroot=${PREFIX_CROSS}"};
 : ${PKG_BINUTILS_HOST_INSTALL_FILES_V2:="
@@ -29,6 +30,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_MINGW32_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_HOST_MINGW32_AUTOCONF_CONFIG_GUESS:="keep"};
 : ${PKG_BINUTILS_HOST_MINGW32_CONFIGURE_ARGS:="--disable-nls --disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=x86_64-w64-mingw32 --with-sysroot=${PREFIX_MINGW32}"};
 : ${PKG_BINUTILS_HOST_MINGW32_LIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_HOST_MINGW32_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
diff --git a/groups/110.native_toolchain.group b/groups/110.native_toolchain.group
index 6bac8753..9fcbe96d 100644
--- a/groups/110.native_toolchain.group
+++ b/groups/110.native_toolchain.group
@@ -9,6 +9,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_VERSION:=2.24.51};
 : ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_AUTOCONF_CONFIG_GUESS:="keep"};
 : ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
 : ${PKG_BINUTILS_CFLAGS_CONFIGURE:="-isystem ${PREFIX_NATIVE}/include -Wno-error=cpp"};
 : ${PKG_BINUTILS_LDFLAGS_CONFIGURE:="-L${PREFIX_NATIVE}/lib"};
@@ -22,6 +23,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_MINGW32_VERSION:=2.24.51};
 : ${PKG_BINUTILS_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_MINGW32_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_MINGW32_AUTOCONF_CONFIG_GUESS:="keep"};
 : ${PKG_BINUTILS_MINGW32_CONFIGURE_ARGS:="--disable-nls --enable-deterministic-archives --host=${DEFAULT_TARGET} --prefix=/ --target=x86_64-w64-mingw32 --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
 : ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_MINGW32_PREFIX:="${PREFIX_NATIVE}"};
-- 
cgit v1.2.3