| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
1 | $NetBSD: patch-configure,v 1.7 2018/01/02 12:18:15 fhajny Exp $ | | 1 | $NetBSD: patch-configure,v 1.8 2018/02/02 10:03:05 jperkin Exp $ |
2 | | | 2 | |
3 | Regen after excluding -latomic test on NetBSD. | | 3 | Regen after excluding -latomic test on NetBSD. |
| | | 4 | Leave pkgsrc to handle security features. |
4 | | | 5 | |
5 | --- configure.orig 2017-11-30 09:43:31.000000000 +0000 | | 6 | --- configure.orig 2017-11-30 09:43:31.000000000 +0000 |
6 | +++ configure | | 7 | +++ configure |
7 | @@ -5569,9 +5569,14 @@ else | | 8 | @@ -5569,9 +5569,14 @@ else |
8 | fi | | 9 | fi |
9 | | | 10 | |
10 | | | 11 | |
11 | - case "$host" in | | 12 | - case "$host" in |
12 | - mips* | powerpc-* ) | | 13 | - mips* | powerpc-* ) |
13 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5 | | 14 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5 |
14 | + case "$host_os" in | | 15 | + case "$host_os" in |
15 | + netbsd*) | | 16 | + netbsd*) |
16 | + : # no -latomic | | 17 | + : # no -latomic |
| @@ -23,26 +24,35 @@ Regen after excluding -latomic test on N | | | @@ -23,26 +24,35 @@ Regen after excluding -latomic test on N |
23 | LDFLAGS="-latomic $LDFLAGS" | | 24 | LDFLAGS="-latomic $LDFLAGS" |
24 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | | 25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
25 | @@ -5593,7 +5598,9 @@ else | | 26 | @@ -5593,7 +5598,9 @@ else |
26 | | | 27 | |
27 | fi | | 28 | fi |
28 | rm -f core conftest.err conftest.$ac_objext \ | | 29 | rm -f core conftest.err conftest.$ac_objext \ |
29 | - conftest$ac_exeext conftest.$ac_ext | | 30 | - conftest$ac_exeext conftest.$ac_ext |
30 | + conftest$ac_exeext conftest.$ac_ext | | 31 | + conftest$ac_exeext conftest.$ac_ext |
31 | + ;; | | 32 | + ;; |
32 | + esac | | 33 | + esac |
33 | ;; | | 34 | ;; |
34 | esac | | 35 | esac |
35 | | | 36 | |
| | | 37 | @@ -6797,7 +6804,7 @@ rm -f core conftest.err conftest.$ac_obj |
| | | 38 | fi |
| | | 39 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fstack_protector" >&5 |
| | | 40 | $as_echo "$gl_cv_warn_cxx__fstack_protector" >&6; } |
| | | 41 | -if test "x$gl_cv_warn_cxx__fstack_protector" = xyes; then : |
| | | 42 | +if test "x$gl_cv_warn_cxx__fstack_protector" = xDISABLED; then : |
| | | 43 | |
| | | 44 | CFLAGS="-fstack-protector $CFLAGS" |
| | | 45 | CXXFLAGS="-fstack-protector $CXXFLAGS" |
36 | @@ -20586,7 +20593,7 @@ fi | | 46 | @@ -20586,7 +20593,7 @@ fi |
37 | | | 47 | |
38 | if test "x$PG_CONFIG" != "x" -o "x$PGSQL_LIBS" = "x"; then : | | 48 | if test "x$PG_CONFIG" != "x" -o "x$PGSQL_LIBS" = "x"; then : |
39 | | | 49 | |
40 | - if test "x$PG_CONFIG" == "x"; then : | | 50 | - if test "x$PG_CONFIG" == "x"; then : |
41 | + if test "x$PG_CONFIG" = "x"; then : | | 51 | + if test "x$PG_CONFIG" = "x"; then : |
42 | | | 52 | |
43 | # Extract the first word of "pg_config", so it can be a program name with args. | | 53 | # Extract the first word of "pg_config", so it can be a program name with args. |
44 | set dummy pg_config; ac_word=$2 | | 54 | set dummy pg_config; ac_word=$2 |
45 | @@ -20630,7 +20637,7 @@ fi | | 55 | @@ -20630,7 +20637,7 @@ fi |
46 | | | 56 | |
47 | | | 57 | |
48 | fi | | 58 | fi |