SunOS fixes.

6 files changed, 86 insertions, 14 deletions

diff --git a/devel/xulrunner192/distinfo b/devel/xulrunner192/distinfo
index 9d1bf178b92..0798d647809 100644
--- a/devel/xulrunner192/distinfo
+++ b/devel/xulrunner192/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2016/05/07 09:54:16 joerg Exp $
+$NetBSD: distinfo,v 1.23 2016/09/16 11:42:24 jperkin Exp $
 
 SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577
 RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc
 SHA512 (firefox-3.6.28.source.tar.bz2) = c788ea7dbd7c725b05af52bc3579f0a355d96768f2955c7a62f845aec66aedd579c3fddb6e61a26a595cacbcc1e5d07782e31940528e615701b9292824af79e9
 Size (firefox-3.6.28.source.tar.bz2) = 51698958 bytes
-SHA1 (patch-aa) = aa07aa70cf681c19b17cfccacd370f8aefa63a49
+SHA1 (patch-aa) = 32b5515c50cfcee512ff9fda5498f319c482b1a6
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = 4b3c8b1a6105298e2ea6810f56c5ea01e9772b64
 SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
@@ -22,7 +22,7 @@ SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
 SHA1 (patch-ap) = 862e97677fa6c473eeb5c000300aa0645239a98e
 SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55
 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
-SHA1 (patch-as) = 44f377c4cdb2fd5aa4f264d6d40c24fbdfe452f5
+SHA1 (patch-as) = f55f00b4ce0b6873ee794c4c5926bf2780c57e41
 SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
 SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
 SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
@@ -46,9 +46,10 @@ SHA1 (patch-embedding_browser_gtk_src_EmbedPrivate.cpp) = a0ec26c6ca751e51586498
 SHA1 (patch-gfx_ots_src_os2.cc) = bf42e5aa49a24f44b49f0d80bdf5d3b0947a3ea5
 SHA1 (patch-gfx_thebes_src_gfxPangoFonts.cpp) = 3285c81fef35475a88e78192ab50bbbcb507c28b
 SHA1 (patch-js_src_build_autoconf_moznbytetype.m4) = 2409b0ee9e889886c3f0fd2317d109fe9b51c699
+SHA1 (patch-layout_base_nsPresArena.cpp) = e86f3c0f70b6be36fec07b2388bb69cd0ac96d0e
 SHA1 (patch-layout_style_nsCSSRuleProcessor.cpp) = 0b013cf6bb6ad7bdb1d20b48cb3e3c51ad813cbf
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
-SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
+SHA1 (patch-mb) = 372bc3ad6242ba0218637ca404eadc01638dadff
 SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
 SHA1 (patch-mf) = 9605856977a23723ff957934913d6e14884abb19
@@ -61,6 +62,7 @@ SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
 SHA1 (patch-mm) = 8db6fbb1197147978bce1de5c9b8017ed940efd1
 SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b
 SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f
+SHA1 (patch-other-licenses_bsdiff_Makefile.in) = 49173d5d3a8d703fdef82762a558d9b2c89cc089
 SHA1 (patch-pa) = df6b19762f03070794fb4cdce79fe792ed9284b1
 SHA1 (patch-pb) = 61f9b8aa5bc377167980f8c2a8715062ac00e66e
 SHA1 (patch-pc) = 4fac35249d1a36c6ccaa3f4e3b4677998ee1d6ee
diff --git a/devel/xulrunner192/patches/patch-aa b/devel/xulrunner192/patches/patch-aa
index a4a4fde58c0..44595268016 100644
--- a/devel/xulrunner192/patches/patch-aa
+++ b/devel/xulrunner192/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2013/10/20 18:17:04 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2016/09/16 11:42:24 jperkin Exp $
 
 Do not allow access to _res on NetBSD.
 
@@ -34,6 +34,19 @@ Do not allow access to _res on NetBSD.
      ;; 
  
  *-hpux*)
+@@ -2555,11 +2558,11 @@ dnl the qsort routine under solaris is f
+     # $ORIGIN/.. is for shared libraries under components/ to locate shared
+     # libraries one level up (e.g. libnspr4.so)
+     LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..'"
++    MOZ_FIX_LINK_PATHS=
+     MOZ_MEMORY=1
+     if test "$SOLARIS_SUNPRO_CC"; then
+        LIBS="-lCrun -lCstd $LIBS"
+        NS_USE_NATIVE=1
+-       MOZ_FIX_LINK_PATHS=
+        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+        CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all"
+        CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife -norunpath"
 @@ -2939,6 +2942,9 @@ if test "$GNU_CC"; then
    AC_CACHE_CHECK(for visibility(hidden) attribute,
                   ac_cv_visibility_hidden,
diff --git a/devel/xulrunner192/patches/patch-as b/devel/xulrunner192/patches/patch-as
index 79ef101c9d4..fb0fb9e2637 100644
--- a/devel/xulrunner192/patches/patch-as
+++ b/devel/xulrunner192/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.4 2013/10/20 18:17:04 joerg Exp $
+$NetBSD: patch-as,v 1.5 2016/09/16 11:42:24 jperkin Exp $
 
 Treat DragonFly like FreeBSD.
 Do not allow access to _res on NetBSD.
@@ -25,6 +25,18 @@ Do not allow access to _res on NetBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
+@@ -2290,10 +2290,10 @@ dnl the qsort routine under solaris is f
+     # $ORIGIN/.. is for shared libraries under components/ to locate shared
+     # libraries one level up (e.g. libnspr4.so)
+     LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..'"
++    MOZ_FIX_LINK_PATHS=
+     if test "$SOLARIS_SUNPRO_CC"; then
+        LIBS="-lCrun -lCstd $LIBS"
+        NS_USE_NATIVE=1
+-       MOZ_FIX_LINK_PATHS=
+        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+        CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all"
+        CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife -norunpath"
 @@ -2509,7 +2509,7 @@ darwin*)
  solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
diff --git a/devel/xulrunner192/patches/patch-layout_base_nsPresArena.cpp b/devel/xulrunner192/patches/patch-layout_base_nsPresArena.cpp
new file mode 100644
index 00000000000..9ff51118a0d
--- /dev/null
+++ b/devel/xulrunner192/patches/patch-layout_base_nsPresArena.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-layout_base_nsPresArena.cpp,v 1.1 2016/09/16 11:42:24 jperkin Exp $
+
+Use posix_madvise() on SunOS.
+
+--- layout/base/nsPresArena.cpp.orig	2012-03-06 14:45:35.000000000 +0000
++++ layout/base/nsPresArena.cpp
+@@ -180,7 +180,11 @@ ReleaseRegion(void *region, PRUword size
+ static bool
+ ProbeRegion(PRUword region, PRUword size)
+ {
++#ifdef __sun
++  if (posix_madvise((caddr_t)region, size, MADV_NORMAL)) {
++#else
+   if (madvise((caddr_t)region, size, MADV_NORMAL)) {
++#endif
+     return true;
+   } else {
+     return false;
diff --git a/devel/xulrunner192/patches/patch-mb b/devel/xulrunner192/patches/patch-mb
index 9bb771e6281..b1b357bba46 100644
--- a/devel/xulrunner192/patches/patch-mb
+++ b/devel/xulrunner192/patches/patch-mb
@@ -1,7 +1,7 @@
-$NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-mb,v 1.2 2016/09/16 11:42:24 jperkin Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-03-16 05:57:24.000000000 -0400
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2010-03-31 05:09:52.000000000 -0400
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2012-03-06 14:45:48.000000000 +0000
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
 @@ -76,7 +76,7 @@ endif
  endif
  endif
@@ -39,7 +39,19 @@ $NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  # BeOS/Intel (uses the same unixish_x86 code)
  #
  ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -200,7 +188,7 @@ endif
+@@ -145,7 +133,11 @@ endif
+ #
+ ifeq ($(OS_ARCH),SunOS)
+ ifeq (86,$(findstring 86,$(OS_TEST)))
++ifeq (x86_64,$(OS_TEST))
++CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
++else
+ CPPSRCS		:= xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp
++endif
+ # 28817: if Solaris Intel OS, and native compiler, always build optimised.
+ ifndef GNU_CC
+ ASFILES		:= xptcinvoke_asm_x86_solaris_SUNW.s xptcstubs_asm_x86_solaris_SUNW.s
+@@ -200,7 +192,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -48,7 +60,7 @@ $NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -255,7 +243,7 @@ endif
+@@ -255,7 +247,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -57,7 +69,7 @@ $NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -295,6 +283,14 @@ ASFLAGS		+= -I$(DIST)/include -x assembl
+@@ -295,6 +287,14 @@ ASFLAGS		+= -I$(DIST)/include -x assembl
  endif
  endif
  
@@ -72,7 +84,7 @@ $NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  ######################################################################
  # PowerPC
  ######################################################################
-@@ -340,9 +336,10 @@ endif
+@@ -340,9 +340,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -84,7 +96,7 @@ $NetBSD: patch-mb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  endif
  
  #
-@@ -414,6 +411,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -414,6 +415,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
diff --git a/devel/xulrunner192/patches/patch-other-licenses_bsdiff_Makefile.in b/devel/xulrunner192/patches/patch-other-licenses_bsdiff_Makefile.in
new file mode 100644
index 00000000000..df77a1e7e20
--- /dev/null
+++ b/devel/xulrunner192/patches/patch-other-licenses_bsdiff_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-other-licenses_bsdiff_Makefile.in,v 1.1 2016/09/16 11:42:24 jperkin Exp $
+
+Ensure we can find libbz2.
+
+--- other-licenses/bsdiff/Makefile.in.orig	2012-03-06 14:45:42.000000000 +0000
++++ other-licenses/bsdiff/Makefile.in
+@@ -51,7 +51,7 @@ HOST_CSRCS = bsdiff.c
+ ifdef CROSS_COMPILE
+ HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
+ else
+-HOST_LIBS += $(BZ2_LIBS)
++HOST_LIBS += $(OS_LDFLAGS) $(BZ2_LIBS)
+ endif
+ 
+ ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))