mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 80574 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80574 | jesus.cea | 2010-04-28 12:32:30 +0200 (Wed, 28 Apr 2010) | 1 line

  Issue #3928: Support 'os.mknod()' in Solaris
........
This commit is contained in:
Jesus Cea 2010-04-28 11:11:36 +00:00
parent 55a22d9105
commit d54cdf038a
3 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -114,6 +114,8 @@ Library
Build Build
----- -----
- Issue #3928: os.mknod() now available in Solaris, also.
- Issue #8175: --with-universal-archs=all works correctly on OSX 10.5 - Issue #8175: --with-universal-archs=all works correctly on OSX 10.5
- Issue #6716: Quote -x arguments of compileall in MSI installer. - Issue #6716: Quote -x arguments of compileall in MSI installer.

39
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 80188 . # From configure.in Revision: 80193 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6. # Generated by GNU Autoconf 2.61 for python 2.6.
# #
@ -3896,7 +3896,7 @@ else
{ echo "$as_me:$LINENO: result: no" >&5 { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; } echo "${ECHO_T}no" >&6; }
fi fi
rm -f -r conftest* rm -f conftest*
@ -5459,7 +5459,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else else
ac_cv_header_stdc=no ac_cv_header_stdc=no
fi fi
rm -f -r conftest* rm -f conftest*
fi fi
@ -5480,7 +5480,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else else
ac_cv_header_stdc=no ac_cv_header_stdc=no
fi fi
rm -f -r conftest* rm -f conftest*
fi fi
@ -6578,7 +6578,7 @@ _ACEOF
fi fi
rm -f -r conftest* rm -f conftest*
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
echo "${ECHO_T}$was_it_defined" >&6; } echo "${ECHO_T}$was_it_defined" >&6; }
@ -6592,7 +6592,14 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#if defined(MAJOR_IN_MKDEV)
#include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS)
#include <sys/sysmacros.h>
#else
#include <sys/types.h> #include <sys/types.h>
#endif
int int
main () main ()
{ {
@ -7108,7 +7115,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else else
ac_cv_type_uid_t=no ac_cv_type_uid_t=no
fi fi
rm -f -r conftest* rm -f conftest*
fi fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@ -14233,7 +14240,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else else
unistd_defines_pthreads=no unistd_defines_pthreads=no
fi fi
rm -f -r conftest* rm -f conftest*
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5 { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
echo "${ECHO_T}$unistd_defines_pthreads" >&6; } echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@ -15847,7 +15854,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then $EGREP "yes" >/dev/null 2>&1; then
ipv6type=$i ipv6type=$i
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
kame) kame)
@ -15870,7 +15877,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6libdir=/usr/local/v6/lib ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes ipv6trylibc=yes
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
linux-glibc) linux-glibc)
@ -15891,7 +15898,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6type=$i; ipv6type=$i;
ipv6trylibc=yes ipv6trylibc=yes
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
linux-inet6) linux-inet6)
@ -15929,7 +15936,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6lib=inet6; ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib ipv6libdir=/usr/local/v6/lib
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
v6d) v6d)
@ -15952,7 +15959,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6libdir=/usr/local/v6/lib; ipv6libdir=/usr/local/v6/lib;
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS" BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
zeta) zeta)
@ -15974,7 +15981,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6lib=inet6; ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib ipv6libdir=/usr/local/v6/lib
fi fi
rm -f -r conftest* rm -f conftest*
;; ;;
esac esac
@ -23752,7 +23759,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
fi fi
rm -f -r conftest* rm -f conftest*
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@ -23771,7 +23778,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
fi fi
rm -f -r conftest* rm -f conftest*
fi fi
@ -24041,7 +24048,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
fi fi
rm -f -r conftest* rm -f conftest*
fi fi

9
configure.in
View file

@ -1360,7 +1360,14 @@ AC_MSG_RESULT($was_it_defined)
# Check whether using makedev requires defining _OSF_SOURCE # Check whether using makedev requires defining _OSF_SOURCE
AC_MSG_CHECKING(for makedev) AC_MSG_CHECKING(for makedev)
AC_TRY_LINK([#include <sys/types.h> ], AC_TRY_LINK([
#if defined(MAJOR_IN_MKDEV)
#include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS)
#include <sys/sysmacros.h>
#else
#include <sys/types.h>
#endif ],
[ makedev(0, 0) ], [ makedev(0, 0) ],
ac_cv_has_makedev=yes, ac_cv_has_makedev=yes,
ac_cv_has_makedev=no) ac_cv_has_makedev=no)