nss/nss_3_12_3.patch

   1 --- misc/mozilla/nsprpub/config/rules.mk        Tue Mar 24 23:49:17 2009
   2 +++ misc/build/mozilla/nsprpub/config/rules.mk  Mon Jun 29 15:45:22 2009
   3 @@ -363,7 +363,11 @@
   4  ifdef NS_USE_GCC
   5         $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
   6  else
   7 -       $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
   8 +        #We remove stl from the paths to avoid that rc.exe finds the stlport of
   9 +        #OOo. stlport includes the system stl which will fail. By removing it,
  10 +        #rc will use the stl from the system if the path is in the INCLUDE
  11 +        #variable.
  12 +       INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
  13  endif # GCC
  14         @echo $(RES) finished
  15  endif
  16 --- misc/mozilla/nsprpub/configure      Fri Dec  5 01:46:50 2008
  17 +++ misc/build/mozilla/nsprpub/configure        Mon Jun 29 15:28:52 2009
  18 @@ -3905,7 +3905,7 @@
  19      PR_MD_CSRCS=linux.c
  20      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
  21      DSO_CFLAGS=-fPIC
  22 -    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
  23 +    DSO_LDOPTS='-shared -Wl,-rpath,\$$ORIGIN -Wl,-soname -Wl,$(notdir $@)'
  24      _OPTIMIZE_FLAGS=-O2
  25      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
  26                                     # combo is not yet good at debugging inlined
  27 --- misc/mozilla/security/coreconf/Darwin.mk    Fri Mar 20 08:19:35 2009
  28 +++ misc/build/mozilla/security/coreconf/Darwin.mk      Mon Jun 29 15:28:52 2009
  29 @@ -38,9 +38,12 @@
  30  include $(CORE_DEPTH)/coreconf/UNIX.mk
  31
  32  DEFAULT_COMPILER = cc
  33 +# CC is taken from environment automatically.
  34 +#CC            = cc
  35 +# Use CCC from environment.
  36 +#CCC           = c++
  37 +CCC            = $(CXX)
  38
  39 -CC             = cc
  40 -CCC            = c++
  41  RANLIB         = ranlib
  42
  43  ifndef CPU_ARCH
  44 --- misc/mozilla/security/coreconf/Linux.mk     Sat Sep  6 01:17:23 2008
  45 +++ misc/build/mozilla/security/coreconf/Linux.mk       Mon Jun 29 15:28:52 2009
  46 @@ -46,8 +46,11 @@
  47         IMPL_STRATEGY = _PTH
  48  endif
  49
  50 -CC                     = gcc
  51 -CCC                    = g++
  52 +# CC is taken from environment automatically.
  53 +#CC                    = gcc
  54 +# Use CCC from environment.
  55 +#CCC                   = g++
  56 +CCC            = $(CXX)
  57  RANLIB                 = ranlib
  58
  59  DEFAULT_COMPILER = gcc
  60 @@ -174,7 +177,7 @@
  61  ARCH                   = linux
  62
  63  DSO_CFLAGS             = -fPIC
  64 -DSO_LDOPTS             = -shared $(ARCHFLAG) -Wl,-z,defs
  65 +DSO_LDOPTS             = -shared $(ARCHFLAG) -Wl,-z,defs  '-Wl,-rpath,$$ORIGIN'
  66  DSO_LDFLAGS            =
  67  LDFLAGS                        += $(ARCHFLAG)
  68
  69 --- misc/mozilla/security/coreconf/SunOS5.mk    Thu Nov 22 05:39:56 2007
  70 +++ misc/build/mozilla/security/coreconf/SunOS5.mk      Mon Jun 29 15:28:52 2009
  71 @@ -89,8 +89,11 @@
  72             # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  73         endif
  74  else
  75 -       CC         = cc
  76 -       CCC        = CC
  77 +# CC is taken from environment automatically.
  78 +#      CC         = cc
  79 +# Use CXX from environment.
  80 +#      CCC        = CC
  81 +        CCC       = $(CXX)
  82         ASFLAGS   += -Wa,-P
  83         OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  84         ifndef BUILD_OPT
  85 --- misc/mozilla/security/coreconf/arch.mk      Wed Mar 11 19:54:24 2009
  86 +++ misc/build/mozilla/security/coreconf/arch.mk        Mon Jun 29 15:28:52 2009
  87 @@ -329,8 +329,14 @@
  88  # IMPL_STRATEGY may be defined too.
  89  #
  90
  91 -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
  92 +# OBJDIR_NAME is used to build the directory containing the built objects, for
  93 +# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ
  94 +# We need to deliver the contents of that folder into the solver. To make that easier
  95 +# in the makefile we rename this directory to "out".
  96 +#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
  97 +OBJDIR_NAME = out
  98
  99 +
 100  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 101  ifndef BUILD_OPT
 102  #
 103 --- misc/mozilla/security/coreconf/rules.mk     Wed Jan 21 00:30:57 2009
 104 +++ misc/build/mozilla/security/coreconf/rules.mk       Mon Jun 29 15:47:42 2009
 105 @@ -359,7 +359,11 @@
 106  ifdef NS_USE_GCC
 107         $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
 108  else
 109 -       $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
 110 +        #We remove stl from the paths to avoid that rc.exe finds the stlport of
 111 +        #OOo. stlport includes the system stl which will fail. By removing it,
 112 +        #rc will use the stl from the system if the path is in the INCLUDE
 113 +        #variable.
 114 +       INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
 115  endif
 116         @echo $(RES) finished
 117  endif
 118 --- misc/mozilla/security/nss/cmd/platlibs.mk   Wed Dec  3 00:24:46 2008
 119 +++ misc/build/mozilla/security/nss/cmd/platlibs.mk     Mon Jun 29 15:28:52 2009
 120 @@ -52,9 +52,9 @@
 121
 122  ifeq ($(OS_ARCH), Linux)
 123  ifeq ($(USE_64), 1)
 124 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
 125 +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN'
 126  else
 127 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
 128 +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
 129  endif
 130  endif
 131