make MacOS X works as build system for most of the packages, update some packages to latest stable upstream version

4 files changed, 44 insertions, 20 deletions

diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
index cfdf4a340..a0a290ee2 100644
--- a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
+++ b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- nss-3.12.6.orig/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
-+++ nss-3.12.6/mozilla/security/coreconf/Linux.mk	2010-04-12 20:18:32.000000000 +0200
+--- nss-3.12.8.orig/mozilla/security/coreconf/Linux.mk	2010-08-13 03:32:29.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/Linux.mk	2010-10-12 13:46:39.000000000 +0200
 @@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
  	IMPL_STRATEGY = _PTH
  endif
@@ -13,21 +13,3 @@
  
  DEFAULT_COMPILER = gcc
  
-@@ -133,7 +133,7 @@ endif
- # not build with -ansi.
- STANDARDS_CFLAGS	= -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
- OS_CFLAGS		= $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
--OS_LIBS			= $(OS_PTHREAD) -ldl -lc
-+OS_LIBS			= $(OS_PTHREAD)
- 
- ifdef USE_PTHREADS
- 	DEFINES		+= -D_REENTRANT
-@@ -148,7 +148,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG)
- # we don't use -z defs there.
- ZDEFS_FLAG		= -Wl,-z,defs
- DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
--LDFLAGS			+= $(ARCHFLAG)
-+#LDFLAGS			+= $(ARCHFLAG)
- 
- # INCLUDES += -I/usr/include -Y/usr/include/linux
- G++INCLUDES		= -I/usr/include/g++
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_command_mk b/package/nss/patches/patch-mozilla_security_coreconf_command_mk
new file mode 100644
index 000000000..518b2e5ea
--- /dev/null
+++ b/package/nss/patches/patch-mozilla_security_coreconf_command_mk
@@ -0,0 +1,11 @@
+--- nss-3.12.8.orig/mozilla/security/coreconf/command.mk	2007-10-23 23:55:00.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/command.mk	2010-10-12 14:44:35.000000000 +0200
+@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
+ CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ PERL          = perl
+-RANLIB        = echo
++RANLIB        = ranlib
+ TAR           = /bin/tar
+ #
+ # For purify
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_rules_mk b/package/nss/patches/patch-mozilla_security_coreconf_rules_mk
new file mode 100644
index 000000000..d58086f58
--- /dev/null
+++ b/package/nss/patches/patch-mozilla_security_coreconf_rules_mk
@@ -0,0 +1,20 @@
+--- nss-3.12.8.orig/mozilla/security/coreconf/rules.mk	2010-04-26 01:37:40.000000000 +0200
++++ nss-3.12.8/mozilla/security/coreconf/rules.mk	2010-10-03 23:41:05.000000000 +0200
+@@ -281,7 +281,7 @@ ifdef MT
+ 	fi
+ endif	# MSVC with manifest tool
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ 
+ get_objs:
+@@ -338,7 +338,7 @@ ifdef MT
+ endif	# MSVC with manifest tool
+ endif
+ else
+-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKSHLIB) -o $@ $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ 	chmod +x $@
+ ifeq ($(OS_TARGET),Darwin)
+ ifdef MAPFILE
diff --git a/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c b/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c
new file mode 100644
index 000000000..111203785
--- /dev/null
+++ b/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c
@@ -0,0 +1,11 @@
+--- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/stubs.c	2010-04-29 02:17:52.000000000 +0200
++++ nss-3.12.8/mozilla/security/nss/lib/freebl/stubs.c	2010-10-03 23:19:08.000000000 +0200
+@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
+  * fetch the library if it's loaded. For NSS it should already be loaded
+  */
+ #define freebl_getLibrary(libName)  \
+-    dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
++    dlopen (libName, RTLD_LAZY)
+ 
+ #define freebl_releaseLibrary(lib) \
+     if (lib) dlclose(lib)