summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-10-04 09:21:52 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-10-04 09:21:52 +0200
commit6b7f1a32ea1c710dc290f38fe59906ee9e69d037 (patch)
treee893d203e0f622c99707a218270b0400a5c1f69b
parent37367580269610419dd61d35d5a40dd7763a24c2 (diff)
downloadpackages-6b7f1a32ea1c710dc290f38fe59906ee9e69d037.tar.xz
core/openssl: adapted to upstream removal of 32-bit switch (openssltarget)
-rw-r--r--community/httpbin/PKGBUILD1
-rw-r--r--core/openssl/PKGBUILD12
2 files changed, 9 insertions, 4 deletions
diff --git a/community/httpbin/PKGBUILD b/community/httpbin/PKGBUILD
deleted file mode 100644
index a209ef85..00000000
--- a/community/httpbin/PKGBUILD
+++ /dev/null
@@ -1 +0,0 @@
-makedepends+=('python2-enum34')
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