diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-11 10:35:49 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-11 10:35:49 +0000 |
| commit | 9de8a3dd724d4361e7045e05585ae435705d8f8e (patch) | |
| tree | c4bc213331dc802fceb4664f47cc9e6ecc7c83d2 | |
| parent | 465a63a6df0fd712b13c4e234cccaa0a803ff9e7 (diff) | |
Fix building when target arch = i386
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1609 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/libnids/patches/no_asm_for_i386.patch | 12 | ||||
| -rw-r--r-- | openwrt/package/openssl/patches/160-configure-i386.patch | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/openwrt/package/libnids/patches/no_asm_for_i386.patch b/openwrt/package/libnids/patches/no_asm_for_i386.patch new file mode 100644 index 000000000..ff6fde7b1 --- /dev/null +++ b/openwrt/package/libnids/patches/no_asm_for_i386.patch @@ -0,0 +1,12 @@ +diff -ruN libnids-1.18-orig/src/checksum.c libnids-1.18/src/checksum.c +--- libnids-1.18-orig/src/checksum.c 2003-09-20 22:40:44.000000000 +0200 ++++ libnids-1.18/src/checksum.c 2005-08-09 23:55:00.000000000 +0200 +@@ -4,7 +4,7 @@ + #include <netinet/tcp.h> + #include <netinet/udp.h> + +-#if ( __i386__ || __i386 ) ++#if 0 + // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels + + /* diff --git a/openwrt/package/openssl/patches/160-configure-i386.patch b/openwrt/package/openssl/patches/160-configure-i386.patch new file mode 100644 index 000000000..33f9d1b87 --- /dev/null +++ b/openwrt/package/openssl/patches/160-configure-i386.patch @@ -0,0 +1,10 @@ +--- openssl-0.9.7g/Configure.old 2005-08-09 15:38:35.000000000 +0200 ++++ openssl-0.9.7g/Configure 2005-08-09 15:41:30.000000000 +0200 +@@ -413,6 +413,7 @@ + "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-amd64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-em64t", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-i386", "gcc:-DL_ENDIAN -DTERMIO \$(CCOPTS) -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |