nss/nss.aix.patch

   1 --- misc/nss-3.13.5/mozilla/nsprpub/configure   2010-08-18 07:23:01.000000000 -0500
   2 +++ misc/build/nss-3.13.5/mozilla/nsprpub/configure     2010-08-18 07:33:11.000000000 -0500
   3 @@ -2973,7 +2973,8 @@
   4  #define SYSV 1
   5  EOF
   6
   7 -    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
   8 +    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
   9 +    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
  10      ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
  11  echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
  12  echo "configure:2980: checking for sys/atomic_op.h" >&5
  13 @@ -3102,7 +3103,6 @@
  14          AIX_LINK_OPTS='-brtl -bnso -berok'
  15          ;;
  16      esac
  17 -    CFLAGS="$CFLAGS -qro -qroconst"
  18      AIX_WRAP='$(DIST)/lib/aixwrap.o'
  19      AIX_TMP='./_aix_tmp.o'
  20      if test -n "$USE_64"; then
  21 --- misc/nss-3.13.5/mozilla/nsprpub/configure.in        2010-08-18 07:23:01.000000000 -0500
  22 +++ misc/build/nss-3.13.5/mozilla/nsprpub/configure.in  2010-08-18 07:32:36.000000000 -0500
  23 @@ -831,7 +831,8 @@
  24      AC_DEFINE(XP_UNIX)
  25      AC_DEFINE(AIX)
  26      AC_DEFINE(SYSV)
  27 -    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
  28 +    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
  29 +    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
  30      AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
  31      case "${target_os}" in
  32      aix3.2*)
  33 @@ -871,10 +872,9 @@
  34          AC_DEFINE(HAVE_SOCKLEN_T)
  35          AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
  36          USE_IPV6=1
  37 -        AIX_LINK_OPTS='-brtl -bnso -berok'
  38 +        AIX_LINK_OPTS='-Wl,-brtl -Wl,-bnso -Wl,-berok'
  39          ;;
  40      esac
  41 -    CFLAGS="$CFLAGS -qro -qroconst"
  42      AIX_WRAP='$(DIST)/lib/aixwrap.o'
  43      AIX_TMP='./_aix_tmp.o'
  44      if test -n "$USE_64"; then
  45 --- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in  2010-08-18 07:23:04.000000000 -0500
  46 +++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in    2010-08-18 07:24:49.000000000 -0500
  47 @@ -110,7 +110,6 @@
  48  endif
  49
  50  ifeq ($(OS_ARCH),AIX)
  51 -DSO_LDOPTS     += -binitfini::_PR_Fini
  52  OS_LIBS                = -lodm -lcfg
  53  ifeq ($(CLASSIC_NSPR),1)
  54  ifeq ($(OS_RELEASE),4.1)
  55 --- misc/nss-3.13.5/mozilla/security/coreconf/AIX.mk    2010-08-18 07:23:06.000000000 -0500
  56 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/AIX.mk      2010-08-18 07:26:26.000000000 -0500
  57 @@ -62,35 +62,30 @@
  58
  59  DEFAULT_COMPILER = xlc_r
  60
  61 -CC             = xlc_r
  62 -CCC            = xlC_r
  63 +CCC            = $(CXX)
  64
  65  CPU_ARCH       = rs6000
  66
  67  RANLIB         = ranlib
  68
  69  OS_CFLAGS      = -DAIX -DSYSV
  70 -OS_LIBS        += -blibpath:/usr/lib:/lib -lc -lm
  71 +OS_LIBS        += -Wl,-blibpath:/usr/lib:/lib -lc -lm
  72
  73 -DSO_LDOPTS     = -brtl -bnortllib -bM:SRE -bnoentry
  74 -MKSHLIB        = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
  75 +DSO_LDOPTS     = -Wl,-brtl -Wl,-bnortllib
  76 +MKSHLIB        = $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm
  77
  78  AIX_WRAP       = $(DIST)/lib/aixwrap.o
  79  AIX_TMP                = $(OBJDIR)/_aix_tmp.o
  80
  81  ifdef MAPFILE
  82 -DSO_LDOPTS     += -bexport:$(MAPFILE)
  83 +DSO_LDOPTS     += -Wl,-bexport:$(MAPFILE)
  84  else
  85 -DSO_LDOPTS     += -bexpall
  86 +DSO_LDOPTS     += -Wl,-bexpall
  87  endif
  88
  89  PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
  90                  sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
  91
  92 -ifdef BUILD_OPT
  93 -       OPTIMIZER += -qmaxmem=-1
  94 -endif
  95 -
  96  ifeq ($(USE_64), 1)
  97         OS_CFLAGS       += -DAIX_64BIT
  98         OBJECT_MODE=64
  99 --- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk        2010-08-18 07:23:18.000000000 -0500
 100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk  2010-08-18 07:26:48.000000000 -0500
 101 @@ -173,7 +173,7 @@
 102         $(NULL)
 103
 104  ifeq ($(OS_ARCH), AIX)
 105 -EXTRA_SHARED_LIBS += -brtl
 106 +EXTRA_SHARED_LIBS += -Wl,-brtl
 107  endif
 108
 109  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 110 @@ -223,7 +223,7 @@
 111         $(NULL)
 112
 113  ifeq ($(OS_ARCH), AIX)
 114 -EXTRA_SHARED_LIBS += -brtl
 115 +EXTRA_SHARED_LIBS += -Wl,-brtl
 116  endif
 117
 118  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 119 --- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile  2010-08-18 07:23:20.000000000 -0500
 120 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile    2010-08-18 07:42:44.000000000 -0500
 121 @@ -75,7 +75,9 @@
 122
 123  endif
 124
 125 -
 126 +ifeq ($(OS), AIX)
 127 +EXTRA_SHARED_LIBS += -lpthreads
 128 +endif
 129
 130  #######################################################################
 131  # (5) Execute "global" rules. (OPTIONAL)                              #
 132 --- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500
 133 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile   2010-08-18 07:55:55.000000000 -0500
 134 @@ -75,6 +75,9 @@
 135
 136  endif
 137
 138 +ifeq ($(OS), AIX)
 139 +EXTRA_SHARED_LIBS += -lpthreads
 140 +endif
 141
 142  # sign any and all shared libraries that contain the word freebl
 143