Merge branch 'master' into i486

1 files changed, 9 insertions, 3 deletions

diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index e3e0d088..4446cbc6 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,11 +1,17 @@
-# i486-specific
+# switch to 32-bit target (was linux-elf before, which I think is wrong also for i686)
+eval "$(
+  declare -f build | \
+    sed '
+      s@linux-x86_64@linux-generic32@
+    '
+)"
+
+# i486-specific, disable hand-crafted assembly code
 if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
         s@no-ssl3-method@no-ssl3-method no-ssl2 no-ssl3@
-        s@'i686'@'i486'@
-        s@'linux-elf'@'linux-generic32'@
       '
   )"
 fi