mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-18 07:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 87639 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2011-01-02 19:37:45 +00:00
parent d823bdcb0e
commit f11d1832ec
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -397,6 +397,7 @@ Orjan Johansen
Fredrik Johansson Fredrik Johansson
Gregory K. Johnson Gregory K. Johnson
Simon Johnston Simon Johnston
Nicolas Joly
Evan Jones Evan Jones
Jeremy Jones Jeremy Jones
Richard Jones Richard Jones

6
Misc/NEWS
View file

@ -92,6 +92,12 @@ Extension Modules
- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. - 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 Tests
----- -----

18
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 86076 . # From configure.in Revision: 86848 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7. # Generated by GNU Autoconf 2.65 for python 2.7.
# #
@ -1934,11 +1934,11 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default $ac_includes_default
enum { N = $2 / 2 - 1 };
int int
main () 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 test_array [0] = 0
; ;
@ -1949,11 +1949,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default $ac_includes_default
enum { N = $2 / 2 - 1 };
int int
main () 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))]; < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0 test_array [0] = 0
@ -7649,8 +7649,8 @@ then
esac esac
fi;; fi;;
NetBSD*|DragonFly*) NetBSD*|DragonFly*)
LDSHARED="cc -shared" LDSHARED="$(CC) -shared"
LDCXXSHARED="c++ -shared";; LDCXXSHARED="$(CXX) -shared";;
OpenUNIX*|UnixWare*) OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared' LDSHARED='$(CC) -shared'
@ -14309,8 +14309,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for. # Files that config.status was made for.
config_files="$ac_config_files" config_files="`echo $ac_config_files`"
config_headers="$ac_config_headers" config_headers="`echo $ac_config_headers`"
_ACEOF _ACEOF

4
configure.in
View file

@ -1875,8 +1875,8 @@ then
esac esac
fi;; fi;;
NetBSD*|DragonFly*) NetBSD*|DragonFly*)
LDSHARED="cc -shared" LDSHARED="$(CC) -shared"
LDCXXSHARED="c++ -shared";; LDCXXSHARED="$(CXX) -shared";;
OpenUNIX*|UnixWare*) OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared' LDSHARED='$(CC) -shared'