Fix build error with clang.

4 files changed, 32 insertions, 12 deletions

diff --git a/net/spserver/files/patch-gnutls_Makefile b/net/spserver/files/patch-gnutls_Makefile
index 8985633f0f80..c7bfe24b9172 100644
--- a/net/spserver/files/patch-gnutls_Makefile
+++ b/net/spserver/files/patch-gnutls_Makefile
@@ -1,6 +1,6 @@
---- gnutls/Makefile.orig	2008-10-06 11:34:04.000000000 +0800
-+++ gnutls/Makefile	2008-10-06 11:34:35.000000000 +0800
-@@ -5,16 +5,16 @@
+--- gnutls/Makefile.orig	2009-12-13 10:02:39.000000000 +0800
++++ gnutls/Makefile	2011-09-05 16:11:46.000000000 +0800
+@@ -5,16 +5,16 @@ CC = gcc
  AR = ar cru
  CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
  SOFLAGS = -shared
@@ -13,11 +13,11 @@
  
 -GNUTLS_INCL = -I/usr/local/include/
 -GNUTLS_LIB  = -L/usr/local/lib -lgcrypt -lgpg-error -lgnutls -lgnutls-extra -lstdc++
-+GNUTLS_INCL = -I%PREFIX%/include/
++GNUTLS_INCL = -I%PREFIX%/include
 +GNUTLS_LIB  = -L%PREFIX%/lib -lgcrypt -lgpg-error -lgnutls -lgnutls-extra -lstdc++
  
 -LIBEVENT_LIB  = -L$(HOME)/libevent -levent
-+LIBEVENT_LIB  = -L%PREFIX%/libevent -levent
++LIBEVENT_LIB  = -L%PREFIX%/lib -levent
  
  SPSERVER_INCL = -I../spserver
  SPSERVER_LIB  = -L../spserver -lspserver
diff --git a/net/spserver/files/patch-matrixssl_Makefile b/net/spserver/files/patch-matrixssl_Makefile
index ca7e69f7f9ff..85cb04479dbb 100644
--- a/net/spserver/files/patch-matrixssl_Makefile
+++ b/net/spserver/files/patch-matrixssl_Makefile
@@ -1,5 +1,5 @@
---- matrixssl/Makefile.orig	2008-06-27 23:18:00.000000000 +0800
-+++ matrixssl/Makefile	2008-10-06 11:21:47.000000000 +0800
+--- matrixssl/Makefile.orig	2009-12-13 10:02:35.000000000 +0800
++++ matrixssl/Makefile	2011-09-05 16:12:25.000000000 +0800
 @@ -3,18 +3,18 @@
  
  CC = gcc
@@ -16,15 +16,15 @@
  
 -MASSL_INCL = -I$(HOME)/matrixssl-1-8-3-open/
 -MASSL_LIB  = -L$(HOME)/matrixssl-1-8-3-open/src -lmatrixssl
-+MASSL_INCL = -I/usr/local/include
-+MASSL_LIB  = -L/usr/local/lib -lmatrixsslstatic
++MASSL_INCL = -I%PREFIX%/include
++MASSL_LIB  = -L%PREFIX%/lib -lmatrixsslstatic
  
 -LIBEVENT_LIB  = -L$(HOME)/libevent -levent
-+LIBEVENT_LIB  = -L/usr/local/lib -levent
++LIBEVENT_LIB  = -L%PREFIX%/lib -levent
  
  SPSERVER_INCL = -I../spserver
  SPSERVER_LIB  = -L../spserver -lspserver
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ libspmatrixssl.so: $(LIBOBJS)
  	$(LINKER) $(SOFLAGS) $^ -o $@
  
  testechos: testechos.o
diff --git a/net/spserver/files/patch-spserver_Makefile b/net/spserver/files/patch-spserver_Makefile
index f79d0ba501b4..ecbb5fe956ba 100644
--- a/net/spserver/files/patch-spserver_Makefile
+++ b/net/spserver/files/patch-spserver_Makefile
@@ -1,5 +1,14 @@
 --- spserver/Makefile.orig	2009-12-13 10:02:38.000000000 +0800
-+++ spserver/Makefile	2009-12-14 14:43:58.000000000 +0800
++++ spserver/Makefile	2011-09-05 16:10:49.000000000 +0800
+@@ -1,7 +1,7 @@
+ 
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
++#CC = gcc
+ AR = ar cru
+ CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+ SOFLAGS = -shared
 @@ -11,8 +11,8 @@ LINKER = $(CC)
  LINT = lint -c
  RM = /bin/rm -f
diff --git a/net/spserver/files/patch-spthreadpool.cpp b/net/spserver/files/patch-spthreadpool.cpp
new file mode 100644
index 000000000000..a78f42821a0b
--- /dev/null
+++ b/net/spserver/files/patch-spthreadpool.cpp
@@ -0,0 +1,11 @@
+--- spserver/spthreadpool.cpp.orig	2011-06-21 08:59:54.000000000 +0800
++++ spserver/spthreadpool.cpp	2011-06-21 09:00:06.000000000 +0800
+@@ -122,7 +122,7 @@ int SP_ThreadPool :: dispatch( DispatchF
+ 
+ 		if( 0 == sp_thread_create( &( thread->mId ), &attr, wrapperFunc, thread ) ) {
+ 			mTotal++;
+-			sp_syslog( LOG_NOTICE, "[tp@%s] create thread#%ld\n", mTag, thread->mId );
++			sp_syslog( LOG_NOTICE, "[tp@%s] create thread#%ld\n", mTag, (long)thread->mId );
+ 		} else {
+ 			ret = -1;
+ 			sp_syslog( LOG_WARNING, "[tp@%s] cannot create thread\n", mTag );