From a040385c0c28bb17d505c1722697cfbc38b6e390 Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 2 Nov 2010 20:09:48 +0000
Subject: [PATCH] matrixssl: Fix compile on uClibc-0.9.31

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23800 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../matrixssl/patches/001-matrixssl_no_timex.patch | 12 ----
 libs/matrixssl/patches/003-matrixssl_typefix.patch | 12 ----
 ...ixssl_1.2.4.patch => 100-matrixssl_1.2.4.patch} |  0
 libs/matrixssl/patches/200-compile-fixes.patch     | 64 ++++++++++++++++++++++
 4 files changed, 64 insertions(+), 24 deletions(-)
 delete mode 100644 libs/matrixssl/patches/001-matrixssl_no_timex.patch
 delete mode 100644 libs/matrixssl/patches/003-matrixssl_typefix.patch
 rename libs/matrixssl/patches/{002-matrixssl_1.2.4.patch => 100-matrixssl_1.2.4.patch} (100%)
 create mode 100644 libs/matrixssl/patches/200-compile-fixes.patch

diff --git a/libs/matrixssl/patches/001-matrixssl_no_timex.patch b/libs/matrixssl/patches/001-matrixssl_no_timex.patch
deleted file mode 100644
index 2523de2ba..000000000
--- a/libs/matrixssl/patches/001-matrixssl_no_timex.patch
+++ /dev/null
@@ -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:
- */
diff --git a/libs/matrixssl/patches/003-matrixssl_typefix.patch b/libs/matrixssl/patches/003-matrixssl_typefix.patch
deleted file mode 100644
index 1b9b7a8d0..000000000
--- a/libs/matrixssl/patches/003-matrixssl_typefix.patch
+++ /dev/null
@@ -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
- 
diff --git a/libs/matrixssl/patches/002-matrixssl_1.2.4.patch b/libs/matrixssl/patches/100-matrixssl_1.2.4.patch
similarity index 100%
rename from libs/matrixssl/patches/002-matrixssl_1.2.4.patch
rename to libs/matrixssl/patches/100-matrixssl_1.2.4.patch
diff --git a/libs/matrixssl/patches/200-compile-fixes.patch b/libs/matrixssl/patches/200-compile-fixes.patch
new file mode 100644
index 000000000..ab6a261a7
--- /dev/null
+++ b/libs/matrixssl/patches/200-compile-fixes.patch
@@ -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
-- 
2.11.0