mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 11:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 76050 via svnmerge from

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

........
  r76050 | gregory.p.smith | 2009-11-01 19:37:37 -0600 (Sun, 01 Nov 2009) | 5 lines

  see http://bugs.python.org/issue1006238 this merges in the following
  patch to make cross compilation of the chflags check easier:

   http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/files/python-2.6-chflags-cross.patch?rev=1.1
........
This commit is contained in:
Benjamin Peterson 2010-01-30 19:36:43 +00:00
parent defccf7dab
commit ed68afa8d6
2 changed files with 203 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

200
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 77196 . # From configure.in Revision: 77216 .
# 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 3.2. # Generated by GNU Autoconf 2.61 for python 3.2.
# #
@ -18550,7 +18550,7 @@ if test "${ac_cv_have_chflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
ac_cv_have_chflags=no ac_cv_have_chflags=cross
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@ -18558,7 +18558,7 @@ _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. */
[
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char*argv[]) int main(int argc, char*argv[])
@ -18567,7 +18567,7 @@ int main(int argc, char*argv[])
return 1; return 1;
return 0; return 0;
} }
]
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
if { (ac_try="$ac_link" if { (ac_try="$ac_link"
@ -18604,11 +18604,98 @@ fi
fi fi
{ echo "$as_me:$LINENO: result: $ac_cv_have_chflags" >&5 { echo "$as_me:$LINENO: result: $ac_cv_have_chflags" >&5
echo "${ECHO_T}$ac_cv_have_chflags" >&6; } echo "${ECHO_T}$ac_cv_have_chflags" >&6; }
if test $ac_cv_have_chflags = yes if test "$ac_cv_have_chflags" = cross ; then
then { echo "$as_me:$LINENO: checking for chflags" >&5
echo $ECHO_N "checking for chflags... $ECHO_C" >&6; }
if test "${ac_cv_func_chflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define chflags to an innocuous variant, in case <limits.h> declares chflags.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define chflags innocuous_chflags
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char chflags (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef chflags
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char chflags ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_chflags || defined __stub___chflags
choke me
#endif
int
main ()
{
return chflags ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_func_chflags=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_chflags=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_chflags" >&5
echo "${ECHO_T}$ac_cv_func_chflags" >&6; }
if test $ac_cv_func_chflags = yes; then
ac_cv_have_chflags="yes"
else
ac_cv_have_chflags="no"
fi
fi
if test "$ac_cv_have_chflags" = yes ; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_CHFLAGS 1 #define HAVE_CHFLAGS 1
@ -18622,7 +18709,7 @@ if test "${ac_cv_have_lchflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
ac_cv_have_lchflags=no ac_cv_have_lchflags=cross
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@ -18630,7 +18717,7 @@ _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. */
[
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char*argv[]) int main(int argc, char*argv[])
@ -18639,7 +18726,7 @@ int main(int argc, char*argv[])
return 1; return 1;
return 0; return 0;
} }
]
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
if { (ac_try="$ac_link" if { (ac_try="$ac_link"
@ -18676,11 +18763,98 @@ fi
fi fi
{ echo "$as_me:$LINENO: result: $ac_cv_have_lchflags" >&5 { echo "$as_me:$LINENO: result: $ac_cv_have_lchflags" >&5
echo "${ECHO_T}$ac_cv_have_lchflags" >&6; } echo "${ECHO_T}$ac_cv_have_lchflags" >&6; }
if test $ac_cv_have_lchflags = yes if test "$ac_cv_have_lchflags" = cross ; then
then { echo "$as_me:$LINENO: checking for lchflags" >&5
echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; }
if test "${ac_cv_func_lchflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define lchflags to an innocuous variant, in case <limits.h> declares lchflags.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define lchflags innocuous_lchflags
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char lchflags (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef lchflags
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char lchflags ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_lchflags || defined __stub___lchflags
choke me
#endif
int
main ()
{
return lchflags ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_func_lchflags=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_lchflags=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_lchflags" >&5
echo "${ECHO_T}$ac_cv_func_lchflags" >&6; }
if test $ac_cv_func_lchflags = yes; then
ac_cv_have_lchflags="yes"
else
ac_cv_have_lchflags="no"
fi
fi
if test "$ac_cv_have_lchflags" = yes ; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_LCHFLAGS 1 #define HAVE_LCHFLAGS 1

32
configure.in
View file

@ -2556,8 +2556,7 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_TRUE],
# On Tru64, chflags seems to be present, but calling it will # On Tru64, chflags seems to be present, but calling it will
# exit Python # exit Python
AC_MSG_CHECKING(for chflags) AC_CACHE_CHECK([for chflags], [ac_cv_have_chflags], [dnl
AC_CACHE_VAL(ac_cv_have_chflags,
AC_TRY_RUN([[ AC_TRY_RUN([[
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -2568,17 +2567,17 @@ int main(int argc, char*argv[])
return 0; return 0;
} }
]], ac_cv_have_chflags=yes, ]], ac_cv_have_chflags=yes,
ac_cv_have_chflags=no, ac_cv_have_chflags=no,
ac_cv_have_chflags=no) ac_cv_have_chflags=cross)
) ])
AC_MSG_RESULT($ac_cv_have_chflags) if test "$ac_cv_have_chflags" = cross ; then
if test $ac_cv_have_chflags = yes AC_CHECK_FUNC([chflags], [ac_cv_have_chflags="yes"], [ac_cv_have_chflags="no"])
then fi
if test "$ac_cv_have_chflags" = yes ; then
AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.) AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
fi fi
AC_MSG_CHECKING(for lchflags) AC_CACHE_CHECK([for lchflags], [ac_cv_have_lchflags], [dnl
AC_CACHE_VAL(ac_cv_have_lchflags,
AC_TRY_RUN([[ AC_TRY_RUN([[
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -2589,12 +2588,13 @@ int main(int argc, char*argv[])
return 0; return 0;
} }
]], ac_cv_have_lchflags=yes, ]], ac_cv_have_lchflags=yes,
ac_cv_have_lchflags=no, ac_cv_have_lchflags=no,
ac_cv_have_lchflags=no) ac_cv_have_lchflags=cross)
) ])
AC_MSG_RESULT($ac_cv_have_lchflags) if test "$ac_cv_have_lchflags" = cross ; then
if test $ac_cv_have_lchflags = yes AC_CHECK_FUNC([lchflags], [ac_cv_have_lchflags="yes"], [ac_cv_have_lchflags="no"])
then fi
if test "$ac_cv_have_lchflags" = yes ; then
AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.) AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
fi fi