From d96f30084ca3c4803dab06545181d4962b066094 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 2 Mar 2010 04:56:49 +0000 Subject: [PATCH] [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 --- package/openssl/Makefile | 4 ---- package/openssl/patches/310-arm_asm.patch | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 package/openssl/patches/310-arm_asm.patch diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 3b99c0868..ef0edb0da 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 9b53a22c7..000000000 --- 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 > $@ -