Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ed68afa

Browse files
benjaminpbenjaminp
committed
Merged revisions 76050 via svnmerge from
svn+ssh://[email protected]/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 ........
1 parent defccf7 commit ed68afa

2 files changed

Lines changed: 203 additions & 29 deletions

File tree

‎configure‎

Lines changed: 187 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 77196 .
2+
# From configure.in Revision: 77216 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.2.
55
#
@@ -18550,15 +18550,15 @@ if test "${ac_cv_have_chflags+set}" = set; then
1855018550
echo $ECHO_N "(cached) $ECHO_C" >&6
1855118551
else
1855218552
if test "$cross_compiling" = yes; then
18553-
ac_cv_have_chflags=no
18553+
ac_cv_have_chflags=cross
1855418554
else
1855518555
cat >conftest.$ac_ext <<_ACEOF
1855618556
/* confdefs.h. */
1855718557
_ACEOF
1855818558
cat confdefs.h >>conftest.$ac_ext
1855918559
cat >>conftest.$ac_ext <<_ACEOF
1856018560
/* end confdefs.h. */
18561-
18561+
[
1856218562
#include <sys/stat.h>
1856318563
#include <unistd.h>
1856418564
int main(int argc, char*argv[])
@@ -18567,7 +18567,7 @@ int main(int argc, char*argv[])
1856718567
return 1;
1856818568
return 0;
1856918569
}
18570-
18570+
]
1857118571
_ACEOF
1857218572
rm -f conftest$ac_exeext
1857318573
if { (ac_try="$ac_link"
@@ -18604,11 +18604,98 @@ fi
1860418604

1860518605

1860618606
fi
18607-
1860818607
{ echo "$as_me:$LINENO: result: $ac_cv_have_chflags" >&5
1860918608
echo "${ECHO_T}$ac_cv_have_chflags" >&6; }
18610-
if test $ac_cv_have_chflags = yes
18611-
then
18609+
if test "$ac_cv_have_chflags" = cross ; then
18610+
{ echo "$as_me:$LINENO: checking for chflags" >&5
18611+
echo $ECHO_N "checking for chflags... $ECHO_C" >&6; }
18612+
if test "${ac_cv_func_chflags+set}" = set; then
18613+
echo $ECHO_N "(cached) $ECHO_C" >&6
18614+
else
18615+
cat >conftest.$ac_ext <<_ACEOF
18616+
/* confdefs.h. */
18617+
_ACEOF
18618+
cat confdefs.h >>conftest.$ac_ext
18619+
cat >>conftest.$ac_ext <<_ACEOF
18620+
/* end confdefs.h. */
18621+
/* Define chflags to an innocuous variant, in case <limits.h> declares chflags.
18622+
For example, HP-UX 11i <limits.h> declares gettimeofday. */
18623+
#define chflags innocuous_chflags
18624+
18625+
/* System header to define __stub macros and hopefully few prototypes,
18626+
which can conflict with char chflags (); below.
18627+
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
18628+
<limits.h> exists even on freestanding compilers. */
18629+
18630+
#ifdef __STDC__
18631+
# include <limits.h>
18632+
#else
18633+
# include <assert.h>
18634+
#endif
18635+
18636+
#undef chflags
18637+
18638+
/* Override any GCC internal prototype to avoid an error.
18639+
Use char because int might match the return type of a GCC
18640+
builtin and then its argument prototype would still apply. */
18641+
#ifdef __cplusplus
18642+
extern "C"
18643+
#endif
18644+
char chflags ();
18645+
/* The GNU C library defines this for functions which it implements
18646+
to always fail with ENOSYS. Some functions are actually named
18647+
something starting with __ and the normal name is an alias. */
18648+
#if defined __stub_chflags || defined __stub___chflags
18649+
choke me
18650+
#endif
18651+
18652+
int
18653+
main ()
18654+
{
18655+
return chflags ();
18656+
;
18657+
return 0;
18658+
}
18659+
_ACEOF
18660+
rm -f conftest.$ac_objext conftest$ac_exeext
18661+
if { (ac_try="$ac_link"
18662+
case "(($ac_try" in
18663+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18664+
*) ac_try_echo=$ac_try;;
18665+
esac
18666+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18667+
(eval "$ac_link") 2>conftest.er1
18668+
ac_status=$?
18669+
grep -v '^ *+' conftest.er1 >conftest.err
18670+
rm -f conftest.er1
18671+
cat conftest.err >&5
18672+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
18673+
(exit $ac_status); } && {
18674+
test -z "$ac_c_werror_flag" ||
18675+
test ! -s conftest.err
18676+
} && test -s conftest$ac_exeext &&
18677+
$as_test_x conftest$ac_exeext; then
18678+
ac_cv_func_chflags=yes
18679+
else
18680+
echo "$as_me: failed program was:" >&5
18681+
sed 's/^/| /' conftest.$ac_ext >&5
18682+
18683+
ac_cv_func_chflags=no
18684+
fi
18685+
18686+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18687+
conftest$ac_exeext conftest.$ac_ext
18688+
fi
18689+
{ echo "$as_me:$LINENO: result: $ac_cv_func_chflags" >&5
18690+
echo "${ECHO_T}$ac_cv_func_chflags" >&6; }
18691+
if test $ac_cv_func_chflags = yes; then
18692+
ac_cv_have_chflags="yes"
18693+
else
18694+
ac_cv_have_chflags="no"
18695+
fi
18696+
18697+
fi
18698+
if test "$ac_cv_have_chflags" = yes ; then
1861218699

1861318700
cat >>confdefs.h <<\_ACEOF
1861418701
#define HAVE_CHFLAGS 1
@@ -18622,15 +18709,15 @@ if test "${ac_cv_have_lchflags+set}" = set; then
1862218709
echo $ECHO_N "(cached) $ECHO_C" >&6
1862318710
else
1862418711
if test "$cross_compiling" = yes; then
18625-
ac_cv_have_lchflags=no
18712+
ac_cv_have_lchflags=cross
1862618713
else
1862718714
cat >conftest.$ac_ext <<_ACEOF
1862818715
/* confdefs.h. */
1862918716
_ACEOF
1863018717
cat confdefs.h >>conftest.$ac_ext
1863118718
cat >>conftest.$ac_ext <<_ACEOF
1863218719
/* end confdefs.h. */
18633-
18720+
[
1863418721
#include <sys/stat.h>
1863518722
#include <unistd.h>
1863618723
int main(int argc, char*argv[])
@@ -18639,7 +18726,7 @@ int main(int argc, char*argv[])
1863918726
return 1;
1864018727
return 0;
1864118728
}
18642-
18729+
]
1864318730
_ACEOF
1864418731
rm -f conftest$ac_exeext
1864518732
if { (ac_try="$ac_link"
@@ -18676,11 +18763,98 @@ fi
1867618763

1867718764

1867818765
fi
18679-
1868018766
{ echo "$as_me:$LINENO: result: $ac_cv_have_lchflags" >&5
1868118767
echo "${ECHO_T}$ac_cv_have_lchflags" >&6; }
18682-
if test $ac_cv_have_lchflags = yes
18683-
then
18768+
if test "$ac_cv_have_lchflags" = cross ; then
18769+
{ echo "$as_me:$LINENO: checking for lchflags" >&5
18770+
echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; }
18771+
if test "${ac_cv_func_lchflags+set}" = set; then
18772+
echo $ECHO_N "(cached) $ECHO_C" >&6
18773+
else
18774+
cat >conftest.$ac_ext <<_ACEOF
18775+
/* confdefs.h. */
18776+
_ACEOF
18777+
cat confdefs.h >>conftest.$ac_ext
18778+
cat >>conftest.$ac_ext <<_ACEOF
18779+
/* end confdefs.h. */
18780+
/* Define lchflags to an innocuous variant, in case <limits.h> declares lchflags.
18781+
For example, HP-UX 11i <limits.h> declares gettimeofday. */
18782+
#define lchflags innocuous_lchflags
18783+
18784+
/* System header to define __stub macros and hopefully few prototypes,
18785+
which can conflict with char lchflags (); below.
18786+
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
18787+
<limits.h> exists even on freestanding compilers. */
18788+
18789+
#ifdef __STDC__
18790+
# include <limits.h>
18791+
#else
18792+
# include <assert.h>
18793+
#endif
18794+
18795+
#undef lchflags
18796+
18797+
/* Override any GCC internal prototype to avoid an error.
18798+
Use char because int might match the return type of a GCC
18799+
builtin and then its argument prototype would still apply. */
18800+
#ifdef __cplusplus
18801+
extern "C"
18802+
#endif
18803+
char lchflags ();
18804+
/* The GNU C library defines this for functions which it implements
18805+
to always fail with ENOSYS. Some functions are actually named
18806+
something starting with __ and the normal name is an alias. */
18807+
#if defined __stub_lchflags || defined __stub___lchflags
18808+
choke me
18809+
#endif
18810+
18811+
int
18812+
main ()
18813+
{
18814+
return lchflags ();
18815+
;
18816+
return 0;
18817+
}
18818+
_ACEOF
18819+
rm -f conftest.$ac_objext conftest$ac_exeext
18820+
if { (ac_try="$ac_link"
18821+
case "(($ac_try" in
18822+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18823+
*) ac_try_echo=$ac_try;;
18824+
esac
18825+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18826+
(eval "$ac_link") 2>conftest.er1
18827+
ac_status=$?
18828+
grep -v '^ *+' conftest.er1 >conftest.err
18829+
rm -f conftest.er1
18830+
cat conftest.err >&5
18831+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
18832+
(exit $ac_status); } && {
18833+
test -z "$ac_c_werror_flag" ||
18834+
test ! -s conftest.err
18835+
} && test -s conftest$ac_exeext &&
18836+
$as_test_x conftest$ac_exeext; then
18837+
ac_cv_func_lchflags=yes
18838+
else
18839+
echo "$as_me: failed program was:" >&5
18840+
sed 's/^/| /' conftest.$ac_ext >&5
18841+
18842+
ac_cv_func_lchflags=no
18843+
fi
18844+
18845+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18846+
conftest$ac_exeext conftest.$ac_ext
18847+
fi
18848+
{ echo "$as_me:$LINENO: result: $ac_cv_func_lchflags" >&5
18849+
echo "${ECHO_T}$ac_cv_func_lchflags" >&6; }
18850+
if test $ac_cv_func_lchflags = yes; then
18851+
ac_cv_have_lchflags="yes"
18852+
else
18853+
ac_cv_have_lchflags="no"
18854+
fi
18855+
18856+
fi
18857+
if test "$ac_cv_have_lchflags" = yes ; then
1868418858

1868518859
cat >>confdefs.h <<\_ACEOF
1868618860
#define HAVE_LCHFLAGS 1

‎configure.in‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,8 +2556,7 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_TRUE],
25562556

25572557
# On Tru64, chflags seems to be present, but calling it will
25582558
# exit Python
2559-
AC_MSG_CHECKING(for chflags)
2560-
AC_CACHE_VAL(ac_cv_have_chflags,
2559+
AC_CACHE_CHECK([for chflags], [ac_cv_have_chflags], [dnl
25612560
AC_TRY_RUN([[
25622561
#include <sys/stat.h>
25632562
#include <unistd.h>
@@ -2568,17 +2567,17 @@ int main(int argc, char*argv[])
25682567
return 0;
25692568
}
25702569
]], ac_cv_have_chflags=yes,
2571-
ac_cv_have_chflags=no,
2572-
ac_cv_have_chflags=no)
2573-
)
2574-
AC_MSG_RESULT($ac_cv_have_chflags)
2575-
if test $ac_cv_have_chflags = yes
2576-
then
2570+
ac_cv_have_chflags=no,
2571+
ac_cv_have_chflags=cross)
2572+
])
2573+
if test "$ac_cv_have_chflags" = cross ; then
2574+
AC_CHECK_FUNC([chflags], [ac_cv_have_chflags="yes"], [ac_cv_have_chflags="no"])
2575+
fi
2576+
if test "$ac_cv_have_chflags" = yes ; then
25772577
AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
25782578
fi
25792579

2580-
AC_MSG_CHECKING(for lchflags)
2581-
AC_CACHE_VAL(ac_cv_have_lchflags,
2580+
AC_CACHE_CHECK([for lchflags], [ac_cv_have_lchflags], [dnl
25822581
AC_TRY_RUN([[
25832582
#include <sys/stat.h>
25842583
#include <unistd.h>
@@ -2589,12 +2588,13 @@ int main(int argc, char*argv[])
25892588
return 0;
25902589
}
25912590
]], ac_cv_have_lchflags=yes,
2592-
ac_cv_have_lchflags=no,
2593-
ac_cv_have_lchflags=no)
2594-
)
2595-
AC_MSG_RESULT($ac_cv_have_lchflags)
2596-
if test $ac_cv_have_lchflags = yes
2597-
then
2591+
ac_cv_have_lchflags=no,
2592+
ac_cv_have_lchflags=cross)
2593+
])
2594+
if test "$ac_cv_have_lchflags" = cross ; then
2595+
AC_CHECK_FUNC([lchflags], [ac_cv_have_lchflags="yes"], [ac_cv_have_lchflags="no"])
2596+
fi
2597+
if test "$ac_cv_have_lchflags" = yes ; then
25982598
AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
25992599
fi
26002600

0 commit comments

Comments
 (0)