diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-07-05 07:25:06 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-07-05 07:25:06 +0000 |
| commit | edbe9d1672874197cb5dd9666d4939fcfcef7134 (patch) | |
| tree | 681bcc0a9128650f263f480f881c3f555fd34508 | |
| parent | def8b8d12db954916e37edf09d9f3598f7645784 (diff) | |
Fix bug [1899] Add table entry to allow openssl to build for AVR32, disabled softfloat
| -rw-r--r-- | package/openssl/openssl-0.9.7m.patch.avr32 | 11 | ||||
| -rw-r--r-- | package/openssl/openssl.mk | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/package/openssl/openssl-0.9.7m.patch.avr32 b/package/openssl/openssl-0.9.7m.patch.avr32 new file mode 100644 index 000000000..20dc1fc32 --- /dev/null +++ b/package/openssl/openssl-0.9.7m.patch.avr32 @@ -0,0 +1,11 @@ +diff -urN openssl-0.9.7m-0rig/Configure openssl-0.9.7m/Configure +--- openssl-0.9.7m-0rig/Configure 2008-07-05 08:59:46.000000000 +0200 ++++ openssl-0.9.7m/Configure 2008-07-05 09:05:10.000000000 +0200 +@@ -396,6 +396,7 @@ + "linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index c47fe0948..b57c7acf0 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -31,10 +31,13 @@ openssl-unpack: $(OPENSSL_DIR)/.unpacked $(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) $(OPENSSL_CAT) $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch + toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch.$(ARCH) # sigh... we have to resort to this just to set a gcc flag. # grumble.. and of course make sure to escape any '/' in CFLAGS +ifeq ($(BR2_avr32),) $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \ $(OPENSSL_DIR)/Configure +endif $(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \ $(OPENSSL_DIR)/Configure $(CONFIG_UPDATE) $(OPENSSL_DIR) |