Prevent configure to pick up non thread safe code that uses _res on NetBSD.

4 files changed, 51 insertions, 22 deletions

diff --git a/devel/xulrunner192/Makefile b/devel/xulrunner192/Makefile
index c57b9f1b97b..6750404e292 100644
--- a/devel/xulrunner192/Makefile
+++ b/devel/xulrunner192/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 23:00:57 adam Exp $
+# $NetBSD: Makefile,v 1.21 2013/01/09 10:34:03 martin Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner192/distinfo b/devel/xulrunner192/distinfo
index 4a1cc957a33..e28b0a6aa3d 100644
--- a/devel/xulrunner192/distinfo
+++ b/devel/xulrunner192/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2012/11/18 01:55:52 joerg Exp $
+$NetBSD: distinfo,v 1.13 2013/01/09 10:34:03 martin Exp $
 
 SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577
 RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc
 Size (firefox-3.6.28.source.tar.bz2) = 51698958 bytes
-SHA1 (patch-aa) = d2c3cceb8c618fdef999e7923ef89e1db1b32802
+SHA1 (patch-aa) = 0700e72aea6a9caf35ff32af936c3d8f1fbcfd62
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = 4b3c8b1a6105298e2ea6810f56c5ea01e9772b64
 SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
@@ -21,7 +21,7 @@ SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
 SHA1 (patch-ap) = 862e97677fa6c473eeb5c000300aa0645239a98e
 SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55
 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
-SHA1 (patch-as) = fbab265b8a9fc279a9d36e0e0c2219eeefea736d
+SHA1 (patch-as) = ff69f8c4a387efb15908a4dd9c50b8c372d2c406
 SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
 SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
 SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
diff --git a/devel/xulrunner192/patches/patch-aa b/devel/xulrunner192/patches/patch-aa
index 304c15ce144..e8298ff7cf1 100644
--- a/devel/xulrunner192/patches/patch-aa
+++ b/devel/xulrunner192/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2013/01/09 10:34:03 martin Exp $
 
---- configure.in.orig	2012-03-06 14:45:23.000000000 +0000
-+++ configure.in
-@@ -1858,7 +1858,7 @@ case "$target" in
+Do not allow access to _res on NetBSD.
+
+--- configure.in.orig	2012-03-06 15:45:23.000000000 +0100
++++ configure.in	2013-01-08 16:00:11.000000000 +0100
+@@ -1858,7 +1858,7 @@
      fi
      ;;
  
@@ -11,7 +13,7 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1872,6 +1872,9 @@ case "$target" in
+@@ -1872,6 +1872,9 @@
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -21,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
      ;; 
  
  *-hpux*)
-@@ -2939,6 +2942,9 @@ if test "$GNU_CC"; then
+@@ -2939,6 +2942,9 @@
    AC_CACHE_CHECK(for visibility(hidden) attribute,
                   ac_cv_visibility_hidden,
                   [cat > conftest.c <<EOF
@@ -31,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
                    int foo __attribute__ ((visibility ("hidden"))) = 1;
  EOF
                    ac_cv_visibility_hidden=no
-@@ -3110,6 +3116,9 @@ dnl ====================================
+@@ -3110,6 +3116,9 @@
  case $target in
  *-hpux11.*)
  	;;
@@ -41,7 +43,20 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4326,6 +4335,14 @@ else
+@@ -3556,7 +3565,11 @@
+         #endif
+         #include <resolv.h>
+         ],
+-        [int foo = res_ninit(&_res);],
++        [
++	#ifdef __NetBSD__
++	#error "_res is not usable in threaded programs"
++	#endif
++	int foo = res_ninit(&_res);],
+         [ac_cv_func_res_ninit=yes],
+         [ac_cv_func_res_ninit=no])
+     ])
+@@ -4326,6 +4339,14 @@
     fi
  fi
  
@@ -56,7 +71,7 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -8630,7 +8647,8 @@ rm -f confdefs.h.save
+@@ -8630,7 +8651,8 @@
  mv confdefs.h confdefs.h.save
  egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
  AC_OUTPUT_MAKE_DEFS()
@@ -66,7 +81,7 @@ $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $
  AC_SUBST(MOZ_DEFINES)
  rm -f confdefs.h
  mv confdefs.h.save confdefs.h
-@@ -8721,6 +8739,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -8721,6 +8743,8 @@
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/devel/xulrunner192/patches/patch-as b/devel/xulrunner192/patches/patch-as
index a951b7845a5..e4b4da54eda 100644
--- a/devel/xulrunner192/patches/patch-as
+++ b/devel/xulrunner192/patches/patch-as
@@ -1,10 +1,11 @@
-$NetBSD: patch-as,v 1.2 2012/11/18 01:55:52 joerg Exp $
+$NetBSD: patch-as,v 1.3 2013/01/09 10:34:03 martin Exp $
 
 Treat DragonFly like FreeBSD.
+Do not allow access to _res on NetBSD.
 
---- js/src/configure.in.orig	2012-03-06 14:45:30.000000000 +0000
-+++ js/src/configure.in
-@@ -1653,7 +1653,7 @@ case "$target" in
+--- js/src/configure.in.orig	2012-03-06 15:45:30.000000000 +0100
++++ js/src/configure.in	2013-01-08 16:00:11.000000000 +0100
+@@ -1653,7 +1653,7 @@
      fi
      ;;
  
@@ -13,7 +14,7 @@ Treat DragonFly like FreeBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2509,7 +2509,7 @@ darwin*)
+@@ -2509,7 +2509,7 @@
  solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
@@ -22,7 +23,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *cygwin*|*mingw*|*mks*|*msvc*|*wince)
-@@ -2724,6 +2724,9 @@ if test "$GNU_CC"; then
+@@ -2724,6 +2724,9 @@
    AC_CACHE_CHECK(for visibility(hidden) attribute,
                   ac_cv_visibility_hidden,
                   [cat > conftest.c <<EOF
@@ -32,7 +33,20 @@ Treat DragonFly like FreeBSD.
                    int foo __attribute__ ((visibility ("hidden"))) = 1;
  EOF
                    ac_cv_visibility_hidden=no
-@@ -4150,7 +4153,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3182,7 +3185,11 @@
+         #endif
+         #include <resolv.h>
+         ],
+-        [int foo = res_ninit(&_res);],
++        [
++	#ifdef __NetBSD__
++	#error "_res is not usable in threaded programs"
++	#endif
++	int foo = res_ninit(&_res);],
+         [ac_cv_func_res_ninit=yes],
+         [ac_cv_func_res_ninit=no])
+     ])
+@@ -4150,7 +4157,7 @@
    darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;