bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matrixssl: Fix compile on uClibc-0.9.31

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@23800 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-11-02 20:09:48 +00:00
parent 4dc7b34dfd
commit a040385c0c
4 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/matrixssl/patches/001-matrixssl_no_timex.patch
View File

@ -1,12 +0,0 @@
diff -urN matrixssl/src/os/linux/linux.c matrixssl.new/src/os/linux/linux.c
--- matrixssl/src/os/linux/linux.c 2005-02-23 22:43:10.000000000 +0100
+++ matrixssl.new/src/os/linux/linux.c 2006-12-10 11:45:54.000000000 +0100
@@ -40,7 +40,7 @@
#include "../osLayer.h"
#if defined(__i386__) || defined(RDTSC)
-#include <asm/timex.h>
+//#include <asm/timex.h>
/*
As defined in asm/timex.h for x386:
*/

12
libs/matrixssl/patches/003-matrixssl_typefix.patch
View File

@ -1,12 +0,0 @@
diff -urN matrixssl.old/src/os/linux/linux.c matrixssl/src/os/linux/linux.c
--- matrixssl.old/src/os/linux/linux.c 2005-02-23 22:43:10.000000000 +0100
+++ matrixssl/src/os/linux/linux.c 2005-03-06 01:52:51.000000000 +0100
@@ -51,7 +51,7 @@
static sslTime_t hiresStart; /* zero-time */
static sslTime_t hiresFreq; /* tics per second */
#else /* __i386__ */
-static unsigned int32 prevTicks; /* Check wrap */
+static uint32 prevTicks; /* Check wrap */
static sslTime_t elapsedTime; /* Last elapsed time */
#endif

0
libs/matrixssl/patches/002-matrixssl_1.2.4.patch → libs/matrixssl/patches/100-matrixssl_1.2.4.patch
View File

64
libs/matrixssl/patches/200-compile-fixes.patch Normal file
View File

@ -0,0 +1,64 @@
Index: matrixssl/src/os/linux/linux.c
===================================================================
--- matrixssl.orig/src/os/linux/linux.c 2010-11-02 21:01:53.702000002 +0100
+++ matrixssl/src/os/linux/linux.c 2010-11-02 21:02:37.657009753 +0100
@@ -39,8 +39,12 @@
#include "../osLayer.h"
+#ifndef CLK_TCK
+# define CLK_TCK CLOCKS_PER_SEC
+#endif
+
#if defined(__i386__) || defined(RDTSC)
-#include <asm/timex.h>
+//#include <asm/timex.h>
/*
As defined in asm/timex.h for x386:
*/
@@ -51,7 +55,7 @@
static sslTime_t hiresStart; /* zero-time */
static sslTime_t hiresFreq; /* tics per second */
#else /* __i386__ */
-static unsigned int32 prevTicks; /* Check wrap */
+static uint32 prevTicks; /* Check wrap */
static sslTime_t elapsedTime; /* Last elapsed time */
#endif
Index: matrixssl/src/Makefile
===================================================================
--- matrixssl.orig/src/Makefile 2010-11-02 21:02:42.312000001 +0100
+++ matrixssl/src/Makefile 2010-11-02 21:04:21.979001189 +0100
@@ -63,13 +63,6 @@
endif
#
-# Override variables for compilation on x86-64 (AMD64, Nacona, etc)
-#
-ifeq ($(shell uname -m),x86_64)
-DFLAGS += -march=k8 -fPIC -DFP_64BIT -DTFM_X86_64 -DRDTSC
-endif
-
-#
# Compile options
#
SHARED = -shared
@@ -77,18 +70,6 @@
LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME)
#
-# Override variables for compilation on Mac OS X (Darwin)
-#
-ifeq ($(shell uname),Darwin)
-CC = cc
-SO = .dylib
-SHARED = -dynamiclib
-CFLAGS += -DOSX -isystem -I/usr/include
-LDFLAGS = -flat_namespace -install_name @executable_path/../src/$(LIBRARY)
-STRIP = test
-endif
-
-#
# Override variables for compilation on uClinux (example only)
#
ifdef UCLINUX