nss-Makefile.patch

   1 diff -Nur nss-3.4.rc1.orig/mozilla/security/coreconf/Linux.mk nss-3.4.rc1/mozilla/security/coreconf/Linux.mk
   2 --- nss-3.4.rc1.orig/mozilla/security/coreconf/Linux.mk Fri Feb 15 23:53:12 2002
   3 +++ nss-3.4.rc1/mozilla/security/coreconf/Linux.mk      Thu Apr 11 20:48:58 2002
   4 @@ -121,8 +121,8 @@
   5  DSO_LDOPTS             = -shared
   6  DSO_LDFLAGS            =
   7
   8 -# INCLUDES += -I/usr/include -Y/usr/include/linux
   9  G++INCLUDES            = -I/usr/include/g++
  10 +INCLUDES += -I/usr/include/nspr
  11
  12  #
  13  # Always set CPU_TAG on Linux, OpenVMS, WINCE.
  14 diff -Nur nss-3.4.rc1.orig/mozilla/security/coreconf/ruleset.mk nss-3.4.rc1/mozilla/security/coreconf/ruleset.mk
  15 --- nss-3.4.rc1.orig/mozilla/security/coreconf/ruleset.mk       Thu Feb 21 22:23:14 2002
  16 +++ nss-3.4.rc1/mozilla/security/coreconf/ruleset.mk    Thu Apr 11 20:48:26 2002
  17 @@ -114,7 +114,7 @@
  18
  19  ifdef LIBRARY_NAME
  20      ifndef LIBRARY
  21 -       LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
  22 +       LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
  23      endif
  24      ifndef SHARED_LIBRARY
  25         SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
  26 diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk
  27 --- nss-3.4.rc1.orig/mozilla/security/nss/cmd/platlibs.mk       Sat Feb 16 00:38:41 2002
  28 +++ nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk    Thu Apr 11 20:45:49 2002
  29 @@ -82,21 +82,21 @@
  30  else
  31
  32  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  33 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  34 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl_3.$(LIB_SUFFIX)
  35  ifdef MOZILLA_SECURITY_BUILD
  36         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  37  endif
  38  ifdef MOZILLA_BSAFE_BUILD
  39         CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
  40 -       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  41 +       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl_3.$(LIB_SUFFIX)
  42  endif
  43  EXTRA_LIBS += \
  44 -       $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
  45 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  46 +       $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
  47 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  48         $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
  49         $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
  50 -       $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
  51 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  52 +       $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  53 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  54         $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
  55         $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
  56         $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
  57 @@ -104,11 +104,11 @@
  58         $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  59         $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
  60         $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
  61 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  62 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  63         $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  64 -       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  65 +       $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
  66         $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
  67 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  68 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  69         $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
  70         $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
  71         $(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
  72 diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.4.rc1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
  73 --- nss-3.4.rc1.orig/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile  Fri Feb 15 23:53:46 2002
  74 +++ nss-3.4.rc1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile       Thu Apr 11 20:46:45 2002
  75 @@ -36,7 +36,7 @@
  76  include $(CORE_DEPTH)/coreconf/config.mk
  77  include config.mk
  78
  79 -CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  80 +CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)freebl_3.$(LIB_SUFFIX)
  81  #SWCILI    = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX)
  82
  83  # can't do this in manifest.mn because OS_TARGET isn't defined there.
  84 @@ -67,7 +67,7 @@
  85  CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  86  endif
  87  ifdef MOZILLA_BSAFE_BUILD
  88 -CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
  89 +CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)bsafe_3.$(LIB_SUFFIX)
  90  CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  91  endif
  92
  93 @@ -73,11 +73,11 @@
  94
  95  EXTRA_LIBS += \
  96         $(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
  97 -       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  98 +       -L$(DIST)/lib -lsoftokn3 \
  99         $(CRYPTO_LIB) \
 100         $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
 101 -       $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 102 -       $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 103 +       -lplc4 \
 104 +       -lplds4 \
 105         $(NULL)
 106
 107  endif
 108 --- nss-3.4.rc1.orig/mozilla/security/nss/lib/softoken/config.mk        Sun Mar  3 03:34:32 2002
 109 +++ nss-3.4.rc1/mozilla/security/nss/lib/softoken/config.mk     Thu Apr 11 22:13:48 2002
 110 @@ -37,7 +37,7 @@
 111  endif
 112
 113  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 114 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 115 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl_3.$(LIB_SUFFIX)
 116  CRYPTODIR=../freebl
 117  ifdef MOZILLA_SECURITY_BUILD
 118         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
 119 --- nss-3.4.rc1.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile    Fri Feb 15 23:53:42 2002
 120 +++ nss-3.4.rc1/mozilla/security/nss/lib/ckfw/builtins/Makefile Thu Apr 11 22:17:58 2002
 121 @@ -54,8 +54,8 @@
 122  else
 123
 124  EXTRA_LIBS += \
 125 -       $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 126 -       $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 127 +       -lplc4 \
 128 +       -lplds4 \
 129         $(NULL)
 130
 131  endif