summaryrefslogtreecommitdiff
path: root/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:49:33 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:49:33 (GMT)
commit070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch)
tree1a4cf65e381c5ce777316fb67e69018feb741f8f /package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
parentd82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff)
parent644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff)
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk Conflicts: mk/build.mk
Diffstat (limited to 'package/nss/patches/patch-mozilla_security_coreconf_Linux_mk')
-rw-r--r--package/nss/patches/patch-mozilla_security_coreconf_Linux_mk22
1 files changed, 20 insertions, 2 deletions
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
index cce23e2..68345c4 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.3.orig/mozilla/security/coreconf/Linux.mk 2008-09-06 01:17:23.000000000 +0200
-+++ nss-3.12.3/mozilla/security/coreconf/Linux.mk 2009-06-24 19:11:27.470840369 +0200
+--- nss-3.12.4.orig/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200
++++ nss-3.12.4/mozilla/security/coreconf/Linux.mk 2009-12-11 20:45:13.000000000 +0100
@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
@@ -13,3 +13,21 @@
DEFAULT_COMPILER = gcc
+@@ -135,7 +135,7 @@ OS_PTHREAD = -lpthread
+ endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+-OS_LIBS = $(OS_PTHREAD) -ldl -lc
++OS_LIBS = $(OS_PTHREAD)
+
+ ifdef USE_PTHREADS
+ DEFINES += -D_REENTRANT
+@@ -151,7 +151,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
+ ZDEFS_FLAG = -Wl,-z,defs
+ DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
+ DSO_LDFLAGS =
+-LDFLAGS += $(ARCHFLAG)
++#LDFLAGS += $(ARCHFLAG)
+
+ # INCLUDES += -I/usr/include -Y/usr/include/linux
+ G++INCLUDES = -I/usr/include/g++