Prevent configure to pick up non thread safe code that uses _res on NetBSD.diff -r1.20 -r1.21 pkgsrc/devel/xulrunner192/Makefile
(martin)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2012/10/08 23:00:57 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2013/01/09 10:34:03 martin Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | PKGNAME= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} | 4 | PKGNAME= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} | |
5 | PKGREVISION= 6 | 5 | PKGREVISION= 7 | |
6 | CATEGORIES= devel www | 6 | CATEGORIES= devel www | |
7 | 7 | |||
8 | MAINTAINER= tnn@NetBSD.org | 8 | MAINTAINER= tnn@NetBSD.org | |
9 | HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner | 9 | HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner | |
10 | COMMENT= XML User Interface Language runtime environment | 10 | COMMENT= XML User Interface Language runtime environment | |
11 | LICENSE= mpl-1.1 | 11 | LICENSE= mpl-1.1 | |
12 | 12 | |||
13 | MOZILLA_DIR= # empty | 13 | MOZILLA_DIR= # empty | |
14 | 14 | |||
15 | PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in | 15 | PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in | |
16 | PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in | 16 | PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in | |
17 | PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in | 17 | PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in | |
18 | PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in | 18 | PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in |
@@ -1,37 +1,37 @@ | @@ -1,37 +1,37 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2012/11/18 01:55:52 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.13 2013/01/09 10:34:03 martin Exp $ | |
2 | 2 | |||
3 | SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577 | 3 | SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577 | |
4 | RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc | 4 | RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc | |
5 | Size (firefox-3.6.28.source.tar.bz2) = 51698958 bytes | 5 | Size (firefox-3.6.28.source.tar.bz2) = 51698958 bytes | |
6 | SHA1 (patch-aa) = d2c3cceb8c618fdef999e7923ef89e1db1b32802 | 6 | SHA1 (patch-aa) = 0700e72aea6a9caf35ff32af936c3d8f1fbcfd62 | |
7 | SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462 | 7 | SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462 | |
8 | SHA1 (patch-ac) = 4b3c8b1a6105298e2ea6810f56c5ea01e9772b64 | 8 | SHA1 (patch-ac) = 4b3c8b1a6105298e2ea6810f56c5ea01e9772b64 | |
9 | SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 | 9 | SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 | |
10 | SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 | 10 | SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 | |
11 | SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df | 11 | SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df | |
12 | SHA1 (patch-ag) = 890b3d559c55fae75ca91fe742bc104bb8c452db | 12 | SHA1 (patch-ag) = 890b3d559c55fae75ca91fe742bc104bb8c452db | |
13 | SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac | 13 | SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac | |
14 | SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a | 14 | SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a | |
15 | SHA1 (patch-aj) = 423e8915f6e6a166bf3bcbc00c22d590821d6e97 | 15 | SHA1 (patch-aj) = 423e8915f6e6a166bf3bcbc00c22d590821d6e97 | |
16 | SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c | 16 | SHA1 (patch-ak) = d9aca1f9e143d600d8bc841984a2244a50b0ac8c | |
17 | SHA1 (patch-al) = 7f369b954c413bd52f89236c5dfcc237d72150a5 | 17 | SHA1 (patch-al) = 7f369b954c413bd52f89236c5dfcc237d72150a5 | |
18 | SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 | 18 | SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 | |
19 | SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 | 19 | SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 | |
20 | SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 | 20 | SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 | |
21 | SHA1 (patch-ap) = 862e97677fa6c473eeb5c000300aa0645239a98e | 21 | SHA1 (patch-ap) = 862e97677fa6c473eeb5c000300aa0645239a98e | |
22 | SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55 | 22 | SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55 | |
23 | SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b | 23 | SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b | |
24 | SHA1 (patch-as) = fbab265b8a9fc279a9d36e0e0c2219eeefea736d | 24 | SHA1 (patch-as) = ff69f8c4a387efb15908a4dd9c50b8c372d2c406 | |
25 | SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536 | 25 | SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536 | |
26 | SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76 | 26 | SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76 | |
27 | SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 | 27 | SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 | |
28 | SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657 | 28 | SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657 | |
29 | SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d | 29 | SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d | |
30 | SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34 | 30 | SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34 | |
31 | SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 | 31 | SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 | |
32 | SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d | 32 | SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d | |
33 | SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527 | 33 | SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527 | |
34 | SHA1 (patch-be) = 30d3285a10f62c7302b2c2809b1ab06bce0d3316 | 34 | SHA1 (patch-be) = 30d3285a10f62c7302b2c2809b1ab06bce0d3316 | |
35 | SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac | 35 | SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac | |
36 | SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90 | 36 | SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90 | |
37 | SHA1 (patch-build_autoconf_moznbytetype.m4) = c0299f856d074f220d29f6388d5b0d96ad4b3e51 | 37 | SHA1 (patch-build_autoconf_moznbytetype.m4) = c0299f856d074f220d29f6388d5b0d96ad4b3e51 |
@@ -1,77 +1,92 @@ | @@ -1,77 +1,92 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2012/11/18 01:55:52 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2013/01/09 10:34:03 martin Exp $ | |
2 | 2 | |||
3 | --- configure.in.orig 2012-03-06 14:45:23.000000000 +0000 | 3 | Do not allow access to _res on NetBSD. | |
4 | +++ configure.in | 4 | ||
5 | @@ -1858,7 +1858,7 @@ case "$target" in | 5 | --- configure.in.orig 2012-03-06 15:45:23.000000000 +0100 | |
6 | +++ configure.in 2013-01-08 16:00:11.000000000 +0100 | |||
7 | @@ -1858,7 +1858,7 @@ | |||
6 | fi | 8 | fi | |
7 | ;; | 9 | ;; | |
8 | 10 | |||
9 | -*-freebsd*) | 11 | -*-freebsd*) | |
10 | +*-freebsd* | *-dragonfly*) | 12 | +*-freebsd* | *-dragonfly*) | |
11 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | 13 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | |
12 | DLL_SUFFIX=".so.1.0" | 14 | DLL_SUFFIX=".so.1.0" | |
13 | DSO_LDOPTS="-shared" | 15 | DSO_LDOPTS="-shared" | |
14 | @@ -1872,6 +1872,9 @@ case "$target" in | 16 | @@ -1872,6 +1872,9 @@ | |
15 | # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' | 17 | # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' | |
16 | # MKSHLIB_UNFORCE_ALL='' | 18 | # MKSHLIB_UNFORCE_ALL='' | |
17 | # fi | 19 | # fi | |
18 | + if test "$LIBRUNPATH"; then | 20 | + if test "$LIBRUNPATH"; then | |
19 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | 21 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | |
20 | + fi | 22 | + fi | |
21 | ;; | 23 | ;; | |
22 | 24 | |||
23 | *-hpux*) | 25 | *-hpux*) | |
24 | @@ -2939,6 +2942,9 @@ if test "$GNU_CC"; then | 26 | @@ -2939,6 +2942,9 @@ | |
25 | AC_CACHE_CHECK(for visibility(hidden) attribute, | 27 | AC_CACHE_CHECK(for visibility(hidden) attribute, | |
26 | ac_cv_visibility_hidden, | 28 | ac_cv_visibility_hidden, | |
27 | [cat > conftest.c <<EOF | 29 | [cat > conftest.c <<EOF | |
28 | +#ifdef __clang__ | 30 | +#ifdef __clang__ | |
29 | +#error Not supported by old Mozilla | 31 | +#error Not supported by old Mozilla | |
30 | +#endif | 32 | +#endif | |
31 | int foo __attribute__ ((visibility ("hidden"))) = 1; | 33 | int foo __attribute__ ((visibility ("hidden"))) = 1; | |
32 | EOF | 34 | EOF | |
33 | ac_cv_visibility_hidden=no | 35 | ac_cv_visibility_hidden=no | |
34 | @@ -3110,6 +3116,9 @@ dnl ==================================== | 36 | @@ -3110,6 +3116,9 @@ | |
35 | case $target in | 37 | case $target in | |
36 | *-hpux11.*) | 38 | *-hpux11.*) | |
37 | ;; | 39 | ;; | |
38 | +*-dragonfly*) | 40 | +*-dragonfly*) | |
39 | + AC_CHECK_LIB(c, gethostbyname_r) | 41 | + AC_CHECK_LIB(c, gethostbyname_r) | |
40 | + ;; | 42 | + ;; | |
41 | *) | 43 | *) | |
42 | AC_CHECK_LIB(c_r, gethostbyname_r) | 44 | AC_CHECK_LIB(c_r, gethostbyname_r) | |
43 | ;; | 45 | ;; | |
44 | @@ -4326,6 +4335,14 @@ else | 46 | @@ -3556,7 +3565,11 @@ | |
47 | #endif | |||
48 | #include <resolv.h> | |||
49 | ], | |||
50 | - [int foo = res_ninit(&_res);], | |||
51 | + [ | |||
52 | + #ifdef __NetBSD__ | |||
53 | + #error "_res is not usable in threaded programs" | |||
54 | + #endif | |||
55 | + int foo = res_ninit(&_res);], | |||
56 | [ac_cv_func_res_ninit=yes], | |||
57 | [ac_cv_func_res_ninit=no]) | |||
58 | ]) | |||
59 | @@ -4326,6 +4339,14 @@ | |||
45 | fi | 60 | fi | |
46 | fi | 61 | fi | |
47 | 62 | |||
48 | +if test -n "${LIBXUL_SDK_DIR}"; then | 63 | +if test -n "${LIBXUL_SDK_DIR}"; then | |
49 | + AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.]) | 64 | + AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.]) | |
50 | + NSPR_CFLAGS="-I${prefix}/include/xulrunner192/unstable `pkg-config --cflags mozilla-nspr`" | 65 | + NSPR_CFLAGS="-I${prefix}/include/xulrunner192/unstable `pkg-config --cflags mozilla-nspr`" | |
51 | + NSPR_LIBS="`pkg-config --libs mozilla-nspr`" | 66 | + NSPR_LIBS="`pkg-config --libs mozilla-nspr`" | |
52 | + NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" | 67 | + NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" | |
53 | + NSS_LIBS="`pkg-config --libs mozilla-nss`" | 68 | + NSS_LIBS="`pkg-config --libs mozilla-nss`" | |
54 | +fi | 69 | +fi | |
55 | + | 70 | + | |
56 | if test -z "$SKIP_LIBRARY_CHECKS"; then | 71 | if test -z "$SKIP_LIBRARY_CHECKS"; then | |
57 | dnl system JPEG support | 72 | dnl system JPEG support | |
58 | dnl ======================================================== | 73 | dnl ======================================================== | |
59 | @@ -8630,7 +8647,8 @@ rm -f confdefs.h.save | 74 | @@ -8630,7 +8651,8 @@ | |
60 | mv confdefs.h confdefs.h.save | 75 | mv confdefs.h confdefs.h.save | |
61 | egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h | 76 | egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h | |
62 | AC_OUTPUT_MAKE_DEFS() | 77 | AC_OUTPUT_MAKE_DEFS() | |
63 | -MOZ_DEFINES=$DEFS | 78 | -MOZ_DEFINES=$DEFS | |
64 | +# nbsed broken. PR bin/42261 | 79 | +# nbsed broken. PR bin/42261 | |
65 | +MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`" | 80 | +MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`" | |
66 | AC_SUBST(MOZ_DEFINES) | 81 | AC_SUBST(MOZ_DEFINES) | |
67 | rm -f confdefs.h | 82 | rm -f confdefs.h | |
68 | mv confdefs.h.save confdefs.h | 83 | mv confdefs.h.save confdefs.h | |
69 | @@ -8721,6 +8739,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then | 84 | @@ -8721,6 +8743,8 @@ | |
70 | AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) | 85 | AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) | |
71 | if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then | 86 | if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then | |
72 | NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` | 87 | NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` | |
73 | + AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.]) | 88 | + AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.]) | |
74 | + NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}" | 89 | + NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}" | |
75 | $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk | 90 | $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk | |
76 | NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags` | 91 | NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags` | |
77 | $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk | 92 | $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk |
@@ -1,43 +1,57 @@ | @@ -1,43 +1,57 @@ | |||
1 | $NetBSD: patch-as,v 1.2 2012/11/18 01:55:52 joerg Exp $ | 1 | $NetBSD: patch-as,v 1.3 2013/01/09 10:34:03 martin Exp $ | |
2 | 2 | |||
3 | Treat DragonFly like FreeBSD. | 3 | Treat DragonFly like FreeBSD. | |
4 | Do not allow access to _res on NetBSD. | |||
4 | 5 | |||
5 | --- js/src/configure.in.orig 2012-03-06 14:45:30.000000000 +0000 | 6 | --- js/src/configure.in.orig 2012-03-06 15:45:30.000000000 +0100 | |
6 | +++ js/src/configure.in | 7 | +++ js/src/configure.in 2013-01-08 16:00:11.000000000 +0100 | |
7 | @@ -1653,7 +1653,7 @@ case "$target" in | 8 | @@ -1653,7 +1653,7 @@ | |
8 | fi | 9 | fi | |
9 | ;; | 10 | ;; | |
10 | 11 | |||
11 | -*-freebsd*) | 12 | -*-freebsd*) | |
12 | +*-freebsd*|*-dragonfly*) | 13 | +*-freebsd*|*-dragonfly*) | |
13 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | 14 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | |
14 | DLL_SUFFIX=".so.1.0" | 15 | DLL_SUFFIX=".so.1.0" | |
15 | DSO_LDOPTS="-shared" | 16 | DSO_LDOPTS="-shared" | |
16 | @@ -2509,7 +2509,7 @@ darwin*) | 17 | @@ -2509,7 +2509,7 @@ | |
17 | solaris*) | 18 | solaris*) | |
18 | AC_DEFINE(AVMPLUS_UNIX) | 19 | AC_DEFINE(AVMPLUS_UNIX) | |
19 | ;; | 20 | ;; | |
20 | -freebsd*|kfreebsd*) | 21 | -freebsd*|kfreebsd*) | |
21 | +freebsd*|kfreebsd*|netbsd*|dragonfly*) | 22 | +freebsd*|kfreebsd*|netbsd*|dragonfly*) | |
22 | AC_DEFINE(AVMPLUS_UNIX) | 23 | AC_DEFINE(AVMPLUS_UNIX) | |
23 | ;; | 24 | ;; | |
24 | *cygwin*|*mingw*|*mks*|*msvc*|*wince) | 25 | *cygwin*|*mingw*|*mks*|*msvc*|*wince) | |
25 | @@ -2724,6 +2724,9 @@ if test "$GNU_CC"; then | 26 | @@ -2724,6 +2724,9 @@ | |
26 | AC_CACHE_CHECK(for visibility(hidden) attribute, | 27 | AC_CACHE_CHECK(for visibility(hidden) attribute, | |
27 | ac_cv_visibility_hidden, | 28 | ac_cv_visibility_hidden, | |
28 | [cat > conftest.c <<EOF | 29 | [cat > conftest.c <<EOF | |
29 | +#ifdef __clang__ | 30 | +#ifdef __clang__ | |
30 | +#error Not supported by old Mozilla | 31 | +#error Not supported by old Mozilla | |
31 | +#endif | 32 | +#endif | |
32 | int foo __attribute__ ((visibility ("hidden"))) = 1; | 33 | int foo __attribute__ ((visibility ("hidden"))) = 1; | |
33 | EOF | 34 | EOF | |
34 | ac_cv_visibility_hidden=no | 35 | ac_cv_visibility_hidden=no | |
35 | @@ -4150,7 +4153,7 @@ if test "$MOZ_MEMORY"; then | 36 | @@ -3182,7 +3185,11 @@ | |
37 | #endif | |||
38 | #include <resolv.h> | |||
39 | ], | |||
40 | - [int foo = res_ninit(&_res);], | |||
41 | + [ | |||
42 | + #ifdef __NetBSD__ | |||
43 | + #error "_res is not usable in threaded programs" | |||
44 | + #endif | |||
45 | + int foo = res_ninit(&_res);], | |||
46 | [ac_cv_func_res_ninit=yes], | |||
47 | [ac_cv_func_res_ninit=no]) | |||
48 | ]) | |||
49 | @@ -4150,7 +4157,7 @@ | |||
36 | darwin*) | 50 | darwin*) | |
37 | AC_DEFINE(MOZ_MEMORY_DARWIN) | 51 | AC_DEFINE(MOZ_MEMORY_DARWIN) | |
38 | ;; | 52 | ;; | |
39 | - *freebsd*) | 53 | - *freebsd*) | |
40 | + *freebsd*|dragonfly*) | 54 | + *freebsd*|dragonfly*) | |
41 | AC_DEFINE(MOZ_MEMORY_BSD) | 55 | AC_DEFINE(MOZ_MEMORY_BSD) | |
42 | ;; | 56 | ;; | |
43 | *linux*) | 57 | *linux*) |