From 3bdb6da7cb41d1961533556f0d3e0018cbf13f06 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 10:51:29 +0200 Subject: extra/mesa: disable vulkan,i915,i965 on i486 --- extra/mesa/PKGBUILD | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 380cad2f..7ee5e8b1 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -12,3 +12,32 @@ eval "$( s@_install fakeinstall/usr/lib/libswrAVX.*@#\0@g ' )" + +# do not build/package vulkan on i486 +# do not build i915,i965 on i486 +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/\(-D vulkan-drivers=\)\S\+ /\1 / + s/\(-D dri-drivers=\(\S\+,\)\?\)i915,/\1/ + s/\(-D dri-drivers=\(\S\+,\)\?\)i965,/\1/ + ' + )" + pkgname=( + $( + printf '%s\n' "${pkgname}" | \ + grep -v '^vulkan-' + ) + ) +fi +eval "$( + declare -f package_vulkan-intel package_vulkan-radeon | \ + sed ' + /^\s*{\s*$/ a arch=('"$( + printf '%s\n' "${arch[@]}" | \ + grep -vxF 'i486' | \ + tr '\n' ' ' + )"') + ' +)" -- cgit v1.2.3-54-g00ecf From 14ee6e74e9d56e85e140e04b582092df08400ea2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 11 Oct 2018 10:51:45 +0200 Subject: extra/nasm: forgot to disable documentaion building on i486 --- extra/nasm/PKGBUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 220091bd..c38d4459 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -10,4 +10,10 @@ prepare() { if [ "${CARCH}" = "i486" ]; then # remove ttf-liberation (X packages missing for installing the font) makedepends=(${makedepends[@]//ttf-liberation/}) + + declare -f build | \ + sed ' + /make .*doc/d + ' + )" fi -- cgit v1.2.3-54-g00ecf From 8bd0b56f808af6b3590e9f4c1b03417ce44c9e34 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 11 Oct 2018 10:55:13 +0200 Subject: extra/nasm: fixed wrong i486 patch --- extra/nasm/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index c38d4459..36e81008 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -11,9 +11,10 @@ if [ "${CARCH}" = "i486" ]; then # remove ttf-liberation (X packages missing for installing the font) makedepends=(${makedepends[@]//ttf-liberation/}) - declare -f build | \ - sed ' - /make .*doc/d - ' + eval "$( + declare -f build | \ + sed " + /make .*doc/d + " )" fi -- cgit v1.2.3-54-g00ecf From 69b383c0e7fab376e4216b89d67fe4fc2b8b4847 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 13:15:45 +0200 Subject: extra/mesa: repair sed --- extra/mesa/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 7ee5e8b1..e447a2bc 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -26,7 +26,7 @@ if [ "$CARCH" = 'i486' ]; then )" pkgname=( $( - printf '%s\n' "${pkgname}" | \ + printf '%s\n' "${pkgname[@]}" | \ grep -v '^vulkan-' ) ) -- cgit v1.2.3-54-g00ecf From 0c75eeb2cfd61871d438ed8c421d7edb921b05cc Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 13:58:18 +0200 Subject: core/openssl: bring in _all_ i686 specific changes that have been there before --- core/openssl/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 4446cbc6..dd495920 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -2,7 +2,8 @@ eval "$( declare -f build | \ sed ' - s@linux-x86_64@linux-generic32@ + s@linux-x86_64@linux-elf@ + s@ enable-ec_nistp_64_gcc_128 @ @ ' )" -- cgit v1.2.3-54-g00ecf From 70dcbbff6495713a9f0f9693265f25273afd13c2 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 13:59:44 +0200 Subject: core/openssl: whoops, I should read the comments around lines I am chaning --- core/openssl/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index dd495920..1e6e1b30 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -2,7 +2,7 @@ eval "$( declare -f build | \ sed ' - s@linux-x86_64@linux-elf@ + s@linux-x86_64@linux-generic32@ s@ enable-ec_nistp_64_gcc_128 @ @ ' )" -- cgit v1.2.3-54-g00ecf From 603f72bea5ad0e1735007a346b3d8661048b0e19 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 14:10:04 +0200 Subject: extra/mesa: do not try to remove vulkan stuff from i486 build - it was not built there ... --- extra/mesa/PKGBUILD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index e447a2bc..df6a511e 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -23,6 +23,10 @@ if [ "$CARCH" = 'i486' ]; then s/\(-D dri-drivers=\(\S\+,\)\?\)i915,/\1/ s/\(-D dri-drivers=\(\S\+,\)\?\)i965,/\1/ ' + declare -f package_mesa | \ + sed ' + \,rm .*/vulkan;,d + ' )" pkgname=( $( -- cgit v1.2.3-54-g00ecf From 52987e2eee914076b5be2c925ef1a337658c7d9c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 14:34:25 +0200 Subject: extra/nvidia-390xx-utils: update checksum --- extra/nvidia-390xx-utils/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/nvidia-390xx-utils/PKGBUILD b/extra/nvidia-390xx-utils/PKGBUILD index 811ef880..ade92d7c 100644 --- a/extra/nvidia-390xx-utils/PKGBUILD +++ b/extra/nvidia-390xx-utils/PKGBUILD @@ -8,7 +8,7 @@ for ((i=${#source[@]}; i>0; i--)); do fi done source[${i}]="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" -sha512sums[${i}]='470e1e71079f4838bc842c2779f7c32c26c37ff30a0d3719d9e534ff0b71775fdf40446766c06505bffc404bfd6871e4f101de4727380418dda0d084e5637bf8' +sha512sums[${i}]='18c5ef058098c0f055bada06888ee07da4d1455d90d393357483c289eab27969d49a593318d28e535941e7ebacde33e349f3a1cb2f7c627366ba5c6b7835ccbd' eval "$( declare -f package_nvidia-390xx-utils | \ -- cgit v1.2.3-54-g00ecf From 1ef3db3df26dd0f4b688aefeb7347cb88b931fa4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 11 Oct 2018 16:04:30 +0200 Subject: core/gpgme: explicitely remove i486 from package functions which we do not package --- core/gpgme/PKGBUILD | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index f35e9323..121220d1 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -1,3 +1,13 @@ +eval "$( + declare -f package_python-gpgme package_python2-gpgme qgpgme | \ + sed ' + /^\s*{\s*$/ a arch=('"$( + printf '%s\n' "${arch[@]}" | \ + grep -vxF 'i486' | \ + tr '\n' ' ' + )"') + ' +)" # i486-specific if [ "${CARCH}" = "i486" ]; then # we only build the library -- cgit v1.2.3-54-g00ecf