diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:02:51 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:02:51 +0100 |
| commit | 43a901ea68bafb0dfe1818553ad131e3e36de1c4 (patch) | |
| tree | c292cb29a42400ebeb55014172b902dc2727518a /core | |
| parent | 54d673f3676d18dc1310d17d4f6cdadd2418d7c8 (diff) | |
| parent | 1ef3db3df26dd0f4b688aefeb7347cb88b931fa4 (diff) | |
| download | packages-43a901ea68bafb0dfe1818553ad131e3e36de1c4.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/gpgme/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/openssl/PKGBUILD | 1 |
2 files changed, 11 insertions, 0 deletions
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 diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 4446cbc6..1e6e1b30 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -3,6 +3,7 @@ eval "$( declare -f build | \ sed ' s@linux-x86_64@linux-generic32@ + s@ enable-ec_nistp_64_gcc_128 @ @ ' )" |