From 2b69ff29c1e9e1dfa61432108efbc477d4e4aceb Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 7 Nov 2018 08:29:47 +0100 Subject: core/gcc: remove spurious change to provides= on i486 --- core/gcc/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/gcc/PKGBUILD') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index fecb7d16..f069b2a4 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -103,7 +103,7 @@ if [ "${CARCH}" = "i486" ]; then eval "$( declare -f package_gcc-libs | \ sed ' - s/libgfortran/libquadmath libgfortran/ + /for lib in / s/libgfortran/libquadmath libgfortran/ ' )" -- cgit v1.2.3-54-g00ecf From b6eda2c4a958d1a3c01cff8b3cd4081d9ee1c3d0 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 7 Nov 2018 09:09:09 +0100 Subject: core/gcc: force build architecture to $CARCH - else, setarch may fool us --- core/gcc/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/gcc/PKGBUILD') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index f069b2a4..cf97f188 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -13,8 +13,9 @@ eval "$( ' declare -f build | \ sed ' - s/--enable-multilib/--disable-multilib/ - s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, + /configure/ s/--enable-multilib/--disable-multilib/ + /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, + /configure/ s/;$/ --build=$CARCH;/ ' declare -f package_gcc-libs | \ sed ' @@ -83,7 +84,7 @@ if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ sed ' - /enable-languages/ s/ada// + /enable-languages/ s/,ada// ' )" -- cgit v1.2.3-54-g00ecf From d95efe2731e3351194283a116970a42f567fd277 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 7 Nov 2018 09:38:34 +0100 Subject: core/gcc: fix --build option for configure --- core/gcc/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/gcc/PKGBUILD') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index cf97f188..4e1592fc 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -15,7 +15,7 @@ eval "$( sed ' /configure/ s/--enable-multilib/--disable-multilib/ /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, - /configure/ s/;$/ --build=$CARCH;/ + /configure/ s/;$/ --build=$CARCH-pc-linux-gnu;/ ' declare -f package_gcc-libs | \ sed ' -- cgit v1.2.3-54-g00ecf