summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-02 04:56:49 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-02 04:56:49 +0000
commitd96f30084ca3c4803dab06545181d4962b066094 (patch)
tree5db2445e1e347b2b15ef702d850d6ed577be03dc /package
parentd7c7e4f683b9efabbd6ec59a23e26e6d3ae1a655 (diff)
[package] openssl: fix build failure on arm, aes asm version is not shipped anymore (closes: #6778)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/openssl/patches/310-arm_asm.patch12
2 files changed, 0 insertions, 16 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 3b99c08684..ef0edb0daf 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -82,11 +82,7 @@ else
OPENSSL_OPTIONS += no-engines
endif
-ifdef CONFIG_arm
-OPENSSL_MAKEFLAGS := AES_ASM_OBJ="aes-armv4.o aes_cbc.o"
-else
OPENSSL_OPTIONS += no-perlasm
-endif
define Build/Configure
(cd $(PKG_BUILD_DIR); \
diff --git a/package/openssl/patches/310-arm_asm.patch b/package/openssl/patches/310-arm_asm.patch
deleted file mode 100644
index 9b53a22c75..0000000000
--- a/package/openssl/patches/310-arm_asm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/crypto/aes/Makefile
-+++ b/crypto/aes/Makefile
-@@ -47,6 +47,9 @@ lib: $(LIBOBJ)
-
- $(LIBOBJ): $(LIBSRC)
-
-+aes-armv4.s: asm/aes-armv4.pl
-+ $(PERL) $^ > $@
-+
- aes-ia64.s: asm/aes-ia64.S
- $(CC) $(CFLAGS) -E asm/aes-ia64.S > $@
-