[Python-checkins] CVS: python/dist/src configure.in,1.169,1.170 configure,1.160,1.161
Guido van Rossum
python-dev@python.org
Mon, 9 Oct 2000 12:52:38 -0700
Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27449
Modified Files:
configure.in configure
Log Message:
Checking in three Darwin-specific patches.
Tony Lownds: [ Patch #101816 ] Fixes shared modules on Mac OS X
1. Mac OS X is recognized by the Next-ish host recognition code as
"Darwin/1.2"
2. When specifying just --with-dyld, modules can compile as shared
3. --with-dyld and --with-next-framework, modules can compile as
shared
4. --with-suffix=.exe, and Lib/plat-darwin1.2 is being made, the regen
script invokes python as python.exe
[I had to reformat this patch a bit to make it work. Please test!]
Dan Wolfe: [ Patch #101823 ] Fix Darwin POSIX Thread redefinition
The patch below fixes the redefinition problem in Darwin with
_POSIX_THREADS. I'm not sure if this is the correct long term fix but
for now it fixes the problem and the fix is specific to Darwin.
Dan Wolfe: [ Patch #101824 ] On Darwin, remove unrecognized option
`-OPT:Olimit=0'
After many, many, many compiles, I finally got itchy of this warning
cluttering up the output... so I scratched (Darwin configs only) and
it's gone! :-)
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -r1.169 -r1.170
*** configure.in 2000/10/09 17:06:13 1.169
--- configure.in 2000/10/09 19:52:35 1.170
***************
*** 342,346 ****
AC_MSG_RESULT($ac_cv_opt_olimit_ok)
if test $ac_cv_opt_olimit_ok = yes; then
! OPT="$OPT -OPT:Olimit=0"
else
AC_MSG_CHECKING(whether $CC accepts -Olimit 1500)
--- 342,349 ----
AC_MSG_RESULT($ac_cv_opt_olimit_ok)
if test $ac_cv_opt_olimit_ok = yes; then
! case $ac_sys_system in
! Darwin*) OPT="$OPT" ;;
! *) OPT="$OPT -OPT:Olimit=0";;
! esac
else
AC_MSG_CHECKING(whether $CC accepts -Olimit 1500)
***************
*** 494,497 ****
--- 497,503 ----
AC_SUBST(LIBTOOL_CRUFT)
case $ac_sys_system/$ac_sys_release in
+ Darwin/*)
+ ns_undef_sym='_environ'
+ LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym" ;;
next/4*)
ns_undef_sym='__environ'
***************
*** 569,573 ****
Darwin/*|next/*)
if test "$ns_dyld"
! then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
fi
--- 575,583 ----
Darwin/*|next/*)
if test "$ns_dyld"
! then
! if test "$ac_sys_system" = Darwin
! then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
! else LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
! fi
else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
fi
***************
*** 640,643 ****
--- 650,654 ----
# loading of any modules which reference it in System.framework
next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
+ Darwin/*) LINKFORSHARED="-framework System" ;;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
***************
*** 762,766 ****
LIBOBJS="$LIBOBJS thread.o"],[
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
LIBOBJS="$LIBOBJS thread.o"],[
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
--- 773,780 ----
LIBOBJS="$LIBOBJS thread.o"],[
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! case $ac_sys_system in
! Darwin*) ;;
! *) AC_DEFINE(_POSIX_THREADS);;
! esac
LIBOBJS="$LIBOBJS thread.o"],[
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
***************
*** 912,916 ****
BeOS*) DYNLOADFILE="dynload_beos.o";;
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
! next/*) DYNLOADFILE="dynload_next.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
--- 926,930 ----
BeOS*) DYNLOADFILE="dynload_beos.o";;
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
! Darwin/*|next/*) DYNLOADFILE="dynload_next.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -r1.160 -r1.161
*** configure 2000/10/09 17:06:13 1.160
--- configure 2000/10/09 19:52:35 1.161
***************
*** 1,8 ****
#! /bin/sh
! # From configure.in Revision: 1.168
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.14.1
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
--- 1,8 ----
#! /bin/sh
[...4375 lines suppressed...]
! echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
exit 0 ;;
-help | --help | --hel | --he | --h)
--- 6010,6014 ----
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
! echo "$CONFIG_STATUS generated by autoconf version 2.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
***************
*** 6326,6329 ****
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
--- 6314,6317 ----
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1