Merged revisions 87639 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87639 | antoine.pitrou | 2011-01-02 20:34:03 +0100 (dim., 02 janv. 2011) | 4 lines
Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
and DragonFly BSD. Patch by Nicolas Joly.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index b168c9a..b6fd1a8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -397,6 +397,7 @@
Fredrik Johansson
Gregory K. Johnson
Simon Johnston
+Nicolas Joly
Evan Jones
Jeremy Jones
Richard Jones
diff --git a/Misc/NEWS b/Misc/NEWS
index 12cee40..bbbbc97 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,12 @@
- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
+Build
+-----
+
+- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
+ and DragonFly BSD. Patch by Nicolas Joly.
+
Tests
-----
diff --git a/configure b/configure
index b29fca1..b80c6d3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 86076 .
+# From configure.in Revision: 86848 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7.
#
@@ -1934,11 +1934,11 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
- enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+ 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
test_array [0] = 0
;
@@ -1949,11 +1949,11 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
- enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+ ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0
@@ -7649,8 +7649,8 @@
esac
fi;;
NetBSD*|DragonFly*)
- LDSHARED="cc -shared"
- LDCXXSHARED="c++ -shared";;
+ LDSHARED="$(CC) -shared"
+ LDCXXSHARED="$(CXX) -shared";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared'
@@ -14309,8 +14309,8 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
_ACEOF
diff --git a/configure.in b/configure.in
index a61eb45..d0d0280 100644
--- a/configure.in
+++ b/configure.in
@@ -1875,8 +1875,8 @@
esac
fi;;
NetBSD*|DragonFly*)
- LDSHARED="cc -shared"
- LDCXXSHARED="c++ -shared";;
+ LDSHARED="$(CC) -shared"
+ LDCXXSHARED="$(CXX) -shared";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared'