mozilla-firefox-nss-system-nspr.patch

   1 Index: mozilla/security/coreconf/location.mk
   2 ===================================================================
   3 RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
   4 retrieving revision 1.9
   5 diff -u -r1.9 location.mk
   6 --- mozilla/security/coreconf/location.mk       25 Apr 2004 15:02:17 -0000      1.9
   7 +++ mozilla/security/coreconf/location.mk       11 Apr 2005 20:21:57 -0000
   8 @@ -61,6 +61,8 @@
   9
  10  DIST          = $(SOURCE_PREFIX)/$(PLATFORM)
  11
  12 +NSPR_LIBDIR   = $(DIST)/lib
  13 +
  14  ifdef BUILD_DEBUG_GC
  15      DEFINES += -DDEBUG_GC
  16  endif
  17 Index: mozilla/security/manager/Makefile.in
  18 ===================================================================
  19 RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
  20 retrieving revision 1.56
  21 diff -u -r1.56 Makefile.in
  22 --- mozilla/security/manager/Makefile.in        14 Mar 2005 10:00:58 -0000      1.56
  23 +++ mozilla/security/manager/Makefile.in        11 Apr 2005 20:21:57 -0000
  24 @@ -76,12 +76,23 @@
  25  endif
  26  endif
  27
  28 +ABS_DIST := $(shell cd $(DIST) && pwd)
  29 +ifeq ($(OS_ARCH),WINNT)
  30 +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
  31 +endif
  32 +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
  33 +ifneq (,$(strip $(NSPR_LIBDIR)))
  34 +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
  35 +else
  36 +NSPR_LIBDIR = $(ABS_DIST)/lib
  37 +endif
  38  # NSS makefiles are not safe for parallel execution.
  39  DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
  40  DEFAULT_GMAKE_FLAGS += CC="$(CC)"
  41 -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
  42 -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
  43 -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
  44 +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
  45 +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
  46 +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
  47 +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
  48  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  49  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
  50  ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
  51 Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
  52 ===================================================================
  53 RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
  54 retrieving revision 1.14
  55 diff -u -r1.14 Makefile
  56 --- mozilla/security/nss/lib/ckfw/builtins/Makefile     20 Jan 2005 02:25:46 -0000      1.14
  57 +++ mozilla/security/nss/lib/ckfw/builtins/Makefile     11 Apr 2005 20:21:57 -0000
  58 @@ -53,23 +53,23 @@
  59  # This is merely an expedient hack and not the right solution.
  60  ifdef NS_USE_GCC
  61  EXTRA_LIBS += \
  62 -       -L$(DIST)/lib \
  63 +       -L$(NSPR_LIBDIR) \
  64         -lplc4 \
  65         -lplds4 \
  66         -lnspr4 \
  67         $(NULL)
  68  else
  69  EXTRA_LIBS += \
  70 -       $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
  71 -       $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
  72 +       $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
  73 +       $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
  74         $(NULL)
  75  endif
  76
  77  else
  78
  79  EXTRA_LIBS += \
  80 -       $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
  81 -       $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
  82 +       $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
  83 +       $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
  84         $(NULL)
  85
  86  endif
  87 Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
  88 ===================================================================
  89 RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
  90 retrieving revision 1.18
  91 diff -u -r1.18 Makefile
  92 --- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile   25 Apr 2004 15:03:08 -0000      1.18
  93 +++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile   11 Apr 2005 20:21:57 -0000
  94 @@ -63,7 +63,7 @@
  95         $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  96         $(CRYPTO_LIB) \
  97         $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
  98 -       -L$(DIST)/lib \
  99 +       -L$(NSPR_LIBDIR) \
 100         -lplc4 \
 101         -lplds4 \
 102         -lnspr4 \
 103 @@ -76,8 +76,8 @@
 104         $(DIST)/lib/softokn.lib \
 105         $(CRYPTO_LIB) \
 106         $(DIST)/lib/secutil.lib \
 107 -       $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
 108 -       $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 109 +       $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
 110 +       $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 111         wsock32.lib \
 112         winmm.lib \
 113         $(NULL)
 114 @@ -98,8 +98,8 @@
 115         $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 116         $(CRYPTO_LIB) \
 117         $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
 118 -       $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 119 -       $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 120 +       $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 121 +       $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 122         $(NULL)
 123
 124  endif