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

Skip to content

Commit d0764e2

Browse files
tirantiran
committed
Merged revisions 59313-59320 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r59317 | martin.v.loewis | 2007-12-04 09:37:59 +0100 (Tue, 04 Dec 2007) | 2 lines Fix chflags issue on Tru64, from #1490190. ........ r59318 | martin.v.loewis | 2007-12-04 09:39:16 +0100 (Tue, 04 Dec 2007) | 2 lines Move nt.access change into the right section. ........ r59320 | christian.heimes | 2007-12-04 15:57:30 +0100 (Tue, 04 Dec 2007) | 2 lines Added self generated UUID for msvcr90.dll to msi.py Readded a missing line. ........
1 parent de10c85 commit d0764e2

3 files changed

Lines changed: 179 additions & 9 deletions

File tree

‎Tools/msi/msi.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@
106106
# from 1 to 2 (due to what I consider a bug in MSI)
107107
# Using the same UUID is fine since these files are versioned,
108108
# so Installer will always keep the newest version.
109+
# NOTE: All uuids are self generated.
109110
msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}"
110-
msvcr90_uuid = "" # XXX
111+
msvcr90_uuid = "{9C28CD84-397C-4045-855C-28B02291A272}"
111112
pythondll_uuid = {
112113
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
113114
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}",
@@ -824,7 +825,8 @@ def extract_msvcr71():
824825
dir = _winreg.QueryValueEx(k, "MSMDir")[0]
825826
_winreg.CloseKey(k)
826827
files = glob.glob1(dir, "*CRT71*")
827-
assert len(files) > 0, (dir, files)
828+
assert len(files) == 1, (dir, files)
829+
file = os.path.join(dir, files[0])
828830
# Extract msvcr71.dll
829831
m = msilib.MakeMerge2()
830832
m.OpenModule(file, 0)

‎configure‎

Lines changed: 141 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 58817 .
2+
# From configure.in Revision: 59247 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.0.
55
#
@@ -15441,13 +15441,11 @@ echo "${ECHO_T}MACHDEP_OBJS" >&6; }
1544115441

1544215442

1544315443

15444-
15445-
15446-
for ac_func in alarm bind_textdomain_codeset chflags chown clock confstr \
15444+
for ac_func in alarm bind_textdomain_codeset chown clock confstr \
1544715445
ctermid execv fchmod fchown fork fpathconf ftime ftruncate \
1544815446
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
1544915447
getpriority getpwent getspnam getspent getsid getwd \
15450-
kill killpg lchflags lchmod lchown lstat mkfifo mknod mktime \
15448+
kill killpg lchmod lchown lstat mkfifo mknod mktime \
1545115449
mremap nice pathconf pause plock poll pthread_init \
1545215450
putenv readlink realpath \
1545315451
select setegid seteuid setgid \
@@ -16211,6 +16209,144 @@ fi
1621116209
fi
1621216210

1621316211

16212+
# On Tru64, chflags seems to be present, but calling it will
16213+
# exit Python
16214+
{ echo "$as_me:$LINENO: checking for chflags" >&5
16215+
echo $ECHO_N "checking for chflags... $ECHO_C" >&6; }
16216+
if test "$cross_compiling" = yes; then
16217+
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
16218+
See \`config.log' for more details." >&5
16219+
echo "$as_me: error: cannot run test program while cross compiling
16220+
See \`config.log' for more details." >&2;}
16221+
{ (exit 1); exit 1; }; }
16222+
else
16223+
cat >conftest.$ac_ext <<_ACEOF
16224+
/* confdefs.h. */
16225+
_ACEOF
16226+
cat confdefs.h >>conftest.$ac_ext
16227+
cat >>conftest.$ac_ext <<_ACEOF
16228+
/* end confdefs.h. */
16229+
16230+
#include <sys/stat.h>
16231+
#include <unistd.h>
16232+
int main(int argc, char*argv[])
16233+
{
16234+
if(chflags(argv[0], 0) != 0)
16235+
return 1;
16236+
return 0;
16237+
}
16238+
16239+
_ACEOF
16240+
rm -f conftest$ac_exeext
16241+
if { (ac_try="$ac_link"
16242+
case "(($ac_try" in
16243+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16244+
*) ac_try_echo=$ac_try;;
16245+
esac
16246+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16247+
(eval "$ac_link") 2>&5
16248+
ac_status=$?
16249+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16250+
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16251+
{ (case "(($ac_try" in
16252+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16253+
*) ac_try_echo=$ac_try;;
16254+
esac
16255+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16256+
(eval "$ac_try") 2>&5
16257+
ac_status=$?
16258+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16259+
(exit $ac_status); }; }; then
16260+
16261+
cat >>confdefs.h <<\_ACEOF
16262+
#define HAVE_CHFLAGS 1
16263+
_ACEOF
16264+
16265+
{ echo "$as_me:$LINENO: result: yes" >&5
16266+
echo "${ECHO_T}yes" >&6; }
16267+
else
16268+
echo "$as_me: program exited with status $ac_status" >&5
16269+
echo "$as_me: failed program was:" >&5
16270+
sed 's/^/| /' conftest.$ac_ext >&5
16271+
16272+
( exit $ac_status )
16273+
{ echo "$as_me:$LINENO: result: no" >&5
16274+
echo "${ECHO_T}no" >&6; }
16275+
16276+
fi
16277+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16278+
fi
16279+
16280+
16281+
16282+
{ echo "$as_me:$LINENO: checking for lchflags" >&5
16283+
echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; }
16284+
if test "$cross_compiling" = yes; then
16285+
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
16286+
See \`config.log' for more details." >&5
16287+
echo "$as_me: error: cannot run test program while cross compiling
16288+
See \`config.log' for more details." >&2;}
16289+
{ (exit 1); exit 1; }; }
16290+
else
16291+
cat >conftest.$ac_ext <<_ACEOF
16292+
/* confdefs.h. */
16293+
_ACEOF
16294+
cat confdefs.h >>conftest.$ac_ext
16295+
cat >>conftest.$ac_ext <<_ACEOF
16296+
/* end confdefs.h. */
16297+
16298+
#include <sys/stat.h>
16299+
#include <unistd.h>
16300+
int main(int argc, char*argv[])
16301+
{
16302+
if(lchflags(argv[0], 0) != 0)
16303+
return 1;
16304+
return 0;
16305+
}
16306+
16307+
_ACEOF
16308+
rm -f conftest$ac_exeext
16309+
if { (ac_try="$ac_link"
16310+
case "(($ac_try" in
16311+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16312+
*) ac_try_echo=$ac_try;;
16313+
esac
16314+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16315+
(eval "$ac_link") 2>&5
16316+
ac_status=$?
16317+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16318+
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16319+
{ (case "(($ac_try" in
16320+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16321+
*) ac_try_echo=$ac_try;;
16322+
esac
16323+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16324+
(eval "$ac_try") 2>&5
16325+
ac_status=$?
16326+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16327+
(exit $ac_status); }; }; then
16328+
16329+
cat >>confdefs.h <<\_ACEOF
16330+
#define HAVE_LCHFLAGS 1
16331+
_ACEOF
16332+
16333+
{ echo "$as_me:$LINENO: result: yes" >&5
16334+
echo "${ECHO_T}yes" >&6; }
16335+
else
16336+
echo "$as_me: program exited with status $ac_status" >&5
16337+
echo "$as_me: failed program was:" >&5
16338+
sed 's/^/| /' conftest.$ac_ext >&5
16339+
16340+
( exit $ac_status )
16341+
{ echo "$as_me:$LINENO: result: no" >&5
16342+
echo "${ECHO_T}no" >&6; }
16343+
16344+
fi
16345+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16346+
fi
16347+
16348+
16349+
1621416350
case $ac_sys_system/$ac_sys_release in
1621516351
Darwin/*)
1621616352
_CUR_CFLAGS="${CFLAGS}"

‎configure.in‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,11 +2274,11 @@ fi
22742274
AC_MSG_RESULT(MACHDEP_OBJS)
22752275

22762276
# checks for library functions
2277-
AC_CHECK_FUNCS(alarm bind_textdomain_codeset chflags chown clock confstr \
2277+
AC_CHECK_FUNCS(alarm bind_textdomain_codeset chown clock confstr \
22782278
ctermid execv fchmod fchown fork fpathconf ftime ftruncate \
22792279
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
22802280
getpriority getpwent getspnam getspent getsid getwd \
2281-
kill killpg lchflags lchmod lchown lstat mkfifo mknod mktime \
2281+
kill killpg lchmod lchown lstat mkfifo mknod mktime \
22822282
mremap nice pathconf pause plock poll pthread_init \
22832283
putenv readlink realpath \
22842284
select setegid seteuid setgid \
@@ -2371,6 +2371,38 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_TRUE],
23712371
AC_CHECK_LIB(resolv, inet_aton)
23722372
)
23732373

2374+
# On Tru64, chflags seems to be present, but calling it will
2375+
# exit Python
2376+
AC_MSG_CHECKING(for chflags)
2377+
AC_TRY_RUN([
2378+
#include <sys/stat.h>
2379+
#include <unistd.h>
2380+
int main(int argc, char*argv[])
2381+
{
2382+
if(chflags(argv[0], 0) != 0)
2383+
return 1;
2384+
return 0;
2385+
}
2386+
],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
2387+
AC_MSG_RESULT(yes),
2388+
AC_MSG_RESULT(no)
2389+
)
2390+
2391+
AC_MSG_CHECKING(for lchflags)
2392+
AC_TRY_RUN([
2393+
#include <sys/stat.h>
2394+
#include <unistd.h>
2395+
int main(int argc, char*argv[])
2396+
{
2397+
if(lchflags(argv[0], 0) != 0)
2398+
return 1;
2399+
return 0;
2400+
}
2401+
],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
2402+
AC_MSG_RESULT(yes),
2403+
AC_MSG_RESULT(no)
2404+
)
2405+
23742406
dnl Check if system zlib has *Copy() functions
23752407
dnl
23762408
dnl On MacOSX the linker will search for dylibs on the entire linker path

0 commit comments

Comments
 (0)