head 1.14; access; symbols pkgsrc-2013Q2:1.14.0.4 pkgsrc-2013Q2-base:1.14 pkgsrc-2012Q4:1.14.0.2 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q1:1.13.0.6 pkgsrc-2012Q1-base:1.13 pkgsrc-2011Q4:1.13.0.4 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q3:1.13.0.2 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.12.0.38 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.36 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.34 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.32 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.30 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.28 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.26 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.24 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.22 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.20 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.18 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.16 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.14 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.12 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.10 pkgsrc-2008Q1:1.12.0.8 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.6 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.4 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.2 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.11.0.4 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.2 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.10.0.4 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.2 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.9.0.2 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.8.0.2 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.7.0.2 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.6.0.2 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.14 date 2012.04.08.19.09.05; author wiz; state dead; branches; next 1.13; 1.13 date 2011.09.14.17.00.20; author hans; state Exp; branches; next 1.12; 1.12 date 2007.06.08.14.16.16; author wiz; state Exp; branches; next 1.11; 1.11 date 2006.12.27.20.49.04; author joerg; state Exp; branches; next 1.10; 1.10 date 2006.04.12.20.21.48; author drochner; state Exp; branches; next 1.9; 1.9 date 2006.01.23.08.00.02; author recht; state Exp; branches; next 1.8; 1.8 date 2005.10.01.21.12.05; author recht; state Exp; branches; next 1.7; 1.7 date 2005.08.31.12.13.02; author darcy; state Exp; branches; next 1.6; 1.6 date 2005.05.09.20.37.51; author recht; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2005.01.24.21.46.33; author tv; state Exp; branches; next 1.4; 1.4 date 2004.12.30.21.56.21; author minskim; state Exp; branches; next 1.3; 1.3 date 2004.12.19.05.45.39; author grant; state Exp; branches; next 1.2; 1.2 date 2004.12.19.05.30.14; author grant; state Exp; branches; next 1.1; 1.1 date 2004.12.05.23.27.51; author recht; state Exp; branches 1.1.1.1; next ; 1.6.2.1 date 2005.09.01.14.24.06; author salo; state Exp; branches; next ; 1.1.1.1 date 2004.12.05.23.27.51; author recht; state Exp; branches; next ; desc @@ 1.14 log @Remove python24 and all traces of it from pkgsrc. Remove devel/py-ctypes (only needed by and supporting python24). Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE lines that just mirror defaults now. Miscellaneous cleanup while editing all these files. @ text @$NetBSD: patch-al,v 1.13 2011/09/14 17:00:20 hans Exp $ --- configure.orig 2006-10-17 18:03:36.000000000 +0200 +++ configure 2011-09-07 15:37:19.069940155 +0200 @@@@ -312,7 +312,7 @@@@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINCC EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@@@ -861,7 +861,9 @@@@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-gcc never use gcc - --with-cxx= enable C++ support + --with-cxx-main= + compile main() and link python executable with C++ + compiler --with-suffix=.exe set executable suffix --with-pydebug build with Py_DEBUG defined --with-libs='lib1 ...' link against additional libs @@@@ -1548,6 +1550,8 @@@@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0]) define_xopen_source=no;; + NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S]) + define_xopen_source=no;; # On Solaris 2.6, sys/wait.h is inconsistent in the usage # of union __?sigval. Reported by Stuart Bishop. SunOS/5.6) @@@@ -1591,10 +1595,10 @@@@ if test $define_xopen_source = yes then # On Solaris w/ g++ it appears that _XOPEN_SOURCE has to be # defined precisely as g++ defines it - # Furthermore, on Solaris 10, XPG6 requires the use of a C99 + # Furthermore, on Solaris >=10, XPG6 requires the use of a C99 # compiler case $ac_sys_system/$ac_sys_release in - SunOS/5.8|SunOS/5.9|SunOS/5.10) + SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11) cat >>confdefs.h <<\_ACEOF #define _XOPEN_SOURCE 500 @@@@ -1614,10 +1618,10 @@@@ _ACEOF # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else # several APIs are not declared. Since this is also needed in some # cases for HP-UX, we define it globally. - # except for Solaris 10, where it must not be defined, + # except for Solaris >=10, where it must not be defined, # as it implies XPG4.2 case $ac_sys_system/$ac_sys_release in - SunOS/5.10) + SunOS/5.10|SunOS/5.11) ;; *) @@@@ -1746,258 +1750,6 @@@@ fi; echo "$as_me:$LINENO: result: $without_gcc" >&5 echo "${ECHO_T}$without_gcc" >&6 - - -MAINOBJ=python.o -echo "$as_me:$LINENO: checking for --with-cxx=" >&5 -echo $ECHO_N "checking for --with-cxx=... $ECHO_C" >&6 - -# Check whether --with-cxx or --without-cxx was given. -if test "${with_cxx+set}" = set; then - withval="$with_cxx" - - check_cxx=no - case $withval in - no) CXX= - with_cxx=no;; - *) CXX=$withval - MAINOBJ=ccpython.o - with_cxx=$withval;; - esac -else - - with_cxx=no - check_cxx=yes - -fi; -echo "$as_me:$LINENO: result: $with_cxx" >&5 -echo "${ECHO_T}$with_cxx" >&6 - -if test "$with_cxx" = "yes" -then - { { echo "$as_me:$LINENO: error: must supply a compiler when using --with-cxx" >&5 -echo "$as_me: error: must supply a compiler when using --with-cxx" >&2;} - { (exit 1); exit 1; }; } -fi - - - - -if test "$check_cxx" = "yes" -then - for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CXX" && break -done -test -n "$CXX" || CXX="notfound" - - if test "$CXX" = "notfound" - then - CXX= - else - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - fi -fi - # If the user switches compilers, we can't believe the cache if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC" then @@@@ -2828,117 +2580,473 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + +echo "$as_me:$LINENO: checking for --with-cxx-main=" >&5 +echo $ECHO_N "checking for --with-cxx-main=... $ECHO_C" >&6 + +# Check whether --with-cxx_main or --without-cxx_main was given. +if test "${with_cxx_main+set}" = set; then + withval="$with_cxx_main" + + + case $withval in + no) with_cxx_main=no + MAINCC='$(CC)';; + yes) with_cxx_main=yes + MAINCC='$(CXX)';; + *) with_cxx_main=yes + MAINCC=$withval + if test -z "$CXX" + then + CXX=$withval + fi;; + esac +else + + with_cxx_main=no + MAINCC='$(CC)' + +fi; +echo "$as_me:$LINENO: result: $with_cxx_main" >&5 +echo "${ECHO_T}$with_cxx_main" >&6 + +preset_cxx="$CXX" +if test -z "$CXX" +then + tracevar="$CC" + case "$CC" in + gcc) # Extract the first word of "g++", so it can be a program name with args. +set dummy g++; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in notfound +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_CXX" && ac_cv_path_CXX="g++" + ;; +esac +fi +CXX=$ac_cv_path_CXX + +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + cc) # Extract the first word of "c++", so it can be a program name with args. +set dummy c++; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in notfound +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_CXX" && ac_cv_path_CXX="c++" + ;; +esac +fi +CXX=$ac_cv_path_CXX + +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + esac + if test "$CXX" = "notfound" + then + CXX="" + fi +fi +if test -z "$CXX" +then + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CXX" && break +done +test -n "$CXX" || CXX="notfound" + + if test "$CXX" = "notfound" + then + CXX="" + fi +fi +if test "$CXX" +then + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include + int main () { -exit (42); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; + esac +done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue +{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + +ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + fi fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h +else + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rm -f conftest$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +if test "$preset_cxx" != "$CXX" +then + { echo "$as_me:$LINENO: WARNING: + + By default, distutils will build C++ extension modules with \"$CXX\". + If this is not intended, then set CXX on the configure command line. + " >&5 +echo "$as_me: WARNING: + + By default, distutils will build C++ extension modules with \"$CXX\". + If this is not intended, then set CXX on the configure command line. + " >&2;} +fi + + # checks for UNIX variants that set C preprocessor variables ac_ext=c @@@@ -3341,22 +3449,7 @@@@ echo "$as_me:$LINENO: checking LINKCC" > echo $ECHO_N "checking LINKCC... $ECHO_C" >&6 if test -z "$LINKCC" then - if test -z "$CXX"; then - LINKCC="\$(PURIFY) \$(CC)" - else - echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc - $CXX -c conftest_a.cc # 2>&5 - echo 'void foo(){}' > conftest_b.$ac_ext - $CC -c conftest_b.$ac_ext # 2>&5 - if $CC -o conftest$ac_exeext conftest_a.$ac_objext conftest_b.$ac_objext 2>&5 \ - && test -s conftest$ac_exeext && ./conftest$ac_exeext - then - LINKCC="\$(PURIFY) \$(CC)" - else - LINKCC="\$(PURIFY) \$(CXX)" - fi - rm -fr conftest* - fi + LINKCC='$(PURIFY) $(MAINCC)' case $ac_sys_system in AIX*) exp_extra="\"\"" @@@@ -3483,15 +3576,10 @@@@ _ACEOF RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) + Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - case $ac_sys_system in - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` - ;; - esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) @@@@ -3907,7 +3995,12 @@@@ echo "${ECHO_T}$ac_cv_no_strict_aliasing ;; # is there any other compiler on Darwin besides gcc? Darwin*) - BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" + if [[ `/usr/bin/arch` = 'ppc' ]] + then + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common" + else + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common" + fi if test "${enable_universalsdk}"; then BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" fi @@@@ -10472,12 +10565,12 @@@@ then LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi fi ;; - Linux*|GNU*) LDSHARED='$(CC) -shared';; + Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; BSD/OS*/4*) LDSHARED="gcc -shared";; FreeBSD*) if [ "`$CC -dM -E - &1 | grep export-dynamic >/dev/null @@@@ -21328,15 +21424,15 @@@@ s,@@EXTRAPLATDIR@@,$EXTRAPLATDIR,;t t s,@@EXTRAMACHDEPPATH@@,$EXTRAMACHDEPPATH,;t t s,@@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@@,$CONFIGURE_MACOSX_DEPLOYMENT_TARGET,;t t s,@@EXPORT_MACOSX_DEPLOYMENT_TARGET@@,$EXPORT_MACOSX_DEPLOYMENT_TARGET,;t t -s,@@CXX@@,$CXX,;t t -s,@@MAINOBJ@@,$MAINOBJ,;t t -s,@@EXEEXT@@,$EXEEXT,;t t s,@@CC@@,$CC,;t t s,@@CFLAGS@@,$CFLAGS,;t t s,@@LDFLAGS@@,$LDFLAGS,;t t s,@@CPPFLAGS@@,$CPPFLAGS,;t t s,@@ac_ct_CC@@,$ac_ct_CC,;t t +s,@@EXEEXT@@,$EXEEXT,;t t s,@@OBJEXT@@,$OBJEXT,;t t +s,@@CXX@@,$CXX,;t t +s,@@MAINCC@@,$MAINCC,;t t s,@@CPP@@,$CPP,;t t s,@@EGREP@@,$EGREP,;t t s,@@BUILDEXEEXT@@,$BUILDEXEEXT,;t t @ 1.13 log @Fix build on SunOS. Teach configure about SunOS 5.11, preventing some pyconfig.h weirdness. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.12 2007/06/08 14:16:16 wiz Exp $ @ 1.12 log @Update to 2.4.4: We are pleased to announce the release of Python 2.4.4 (FINAL), a bugfix release of Python 2.4, on October 18, 2006. Important: 2.4.4 includes a security fix (PSF-2006-001) for the repr() of unicode strings in wide unicode builds (UCS-4) [does not affect pkgsrc] Python 2.4 is now in bugfix-only mode; no new features are being added. At least 80 bugs have been squished since Python 2.4.3, including a number of bugs and potential bugs found by with the Coverity and Klocwork static analysis tools. We'd like to offer our thanks to both these firms for making this available for open source projects - see their websites if you're interested. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $ d3 2 a4 2 --- configure.orig 2006-10-17 16:03:36.000000000 +0000 +++ configure d34 26 @ 1.11 log @Fix build on FreeBSD. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2006-02-17 08:39:55.000000000 +0000 d9 2 a10 2 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX MAINCC CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS' d14 1 a14 1 @@@@ -859,7 +859,9 @@@@ Optional Packages: d25 1 a25 1 @@@@ -1482,6 +1484,8 @@@@ case $ac_sys_system/$ac_sys_release in d27 1 a27 1 OpenBSD/2.* | OpenBSD/3.[012345678]) d34 1 a34 1 @@@@ -1676,258 +1680,6 @@@@ fi; d293 1 a293 1 @@@@ -2758,117 +2510,473 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c d843 1 a843 1 @@@@ -3271,22 +3379,7 @@@@ echo "$as_me:$LINENO: checking LINKCC" > d867 1 a867 1 @@@@ -3413,15 +3506,10 @@@@ _ACEOF d884 1 a884 1 @@@@ -3837,7 +3925,12 @@@@ echo "${ECHO_T}$ac_cv_no_strict_aliasing d895 4 a898 4 ;; esac ;; @@@@ -10373,12 +10466,12 @@@@ then d912 1 a912 1 OpenBSD*|FreeBSD*) d914 2 a915 2 @@@@ -10388,6 +10481,7 @@@@ then LDSHARED="ld -Bshareable ${LDFLAGS}" d922 1 a922 1 @@@@ -10421,6 +10515,7 @@@@ then d930 1 a930 1 @@@@ -10478,6 +10573,7 @@@@ then d938 1 a938 2 @@@@ -21203,15 +21299,15 @@@@ s,@@SGI_ABI@@,$SGI_ABI,;t t s,@@EXTRAPLATDIR@@,$EXTRAPLATDIR,;t t d941 1 @ 1.10 log @update python24 to 2.4.3 Python 2.4 is now in bugfix-only mode, no new features are being added. At least 50 bugs have been squashed since Python 2.4.2, including a number of bugs and potential bugs found by Coverity. @ text @d3 1 a3 1 --- configure.orig 2006-02-17 09:39:55.000000000 +0100 d867 1 a867 1 @@@@ -3413,7 +3506,7 @@@@ _ACEOF d876 9 a884 1 @@@@ -3837,7 +3930,12 @@@@ echo "${ECHO_T}$ac_cv_no_strict_aliasing d898 1 a898 1 @@@@ -10373,12 +10471,12 @@@@ then d914 1 a914 1 @@@@ -10388,6 +10486,7 @@@@ then d922 1 a922 1 @@@@ -10421,6 +10520,7 @@@@ then d930 1 a930 1 @@@@ -10478,6 +10578,7 @@@@ then d938 1 a938 1 @@@@ -21203,15 +21304,15 @@@@ s,@@SGI_ABI@@,$SGI_ABI,;t t @ 1.9 log @Fix module compilation / libpython build on Darwin. This enables modules not part of the std. Python install to work again. Secondly, add a patch from Christoph Ludwig ( http://sourceforge.net/tracker/?func=detail&aid=1324762&group_id=5470&atid=305470 ) which contains the following changes (from the SourceForge post): 1) The configure option --with-cxx is renamed --with-cxx-main. This was done to avoid surprising the user by the changed meaning. Furthermore, it is now possible that CXX has a different value than provided by --with-cxx-main, so the old name would have been confusing. 2) The compiler used to translate python's main() function is stored in the configure / Makefile variable MAINCC. By default, MAINCC=$(CC). If --with-cxx-main is given (without an appended compiler name), then MAINCC=$(CXX). If --with-cxx-main= is on the configure command line, then MAINCC=. Additionally, configure sets CXX= unless CXX was already set on the configure command line. 3) The command used to link the python executable is (as before) stored in LINKCC. By default, LINKCC='$(PURIFY) $(MAINCC)', i.e. the linker front-end is the compiler used to translate main(). If necessary, LINKCC can be set on the configure command line in which case it won't be altered. 4) If CXX is not set by the user (on the command line or via --with-cxx-main), then configure tries several likely C++ compiler names. CXX is assigned the first name that refers to a callable program in the system. (CXX is set even if python is built with a C compiler only, so distutils can build C++ extensions.) 5) Modules/ccpython.cc is no longer used and can be removed. @ text @d3 3 a5 3 --- configure.orig 2005-12-11 23:02:37.000000000 +0100 +++ configure 2005-12-11 23:02:22.000000000 +0100 @@@@ -312,7 +312,7 @@@@ d14 1 a14 1 @@@@ -859,7 +859,9 @@@@ d25 1 a25 1 @@@@ -1482,6 +1484,8 @@@@ d27 1 a27 1 OpenBSD/2.* | OpenBSD/3.[0123456]) d34 1 a34 1 @@@@ -1667,258 +1671,6 @@@@ d293 11 a303 6 @@@@ -2755,111 +2507,467 @@@@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include d590 7 a596 5 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ d843 1 a843 1 @@@@ -3262,22 +3370,7 @@@@ d867 1 a867 1 @@@@ -3404,7 +3497,7 @@@@ d871 1 a871 1 - Linux*|GNU*|NetBSD*|FreeBSD*) d876 1 a876 1 @@@@ -3828,7 +3921,12 @@@@ d890 1 a890 1 @@@@ -10364,12 +10462,12 @@@@ d906 1 a906 2 @@@@ -10378,7 +10476,8 @@@@ else d909 1 a909 2 - NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";; + NetBSD*|DragonFly*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; d914 1 a914 2 @@@@ -10410,7 +10509,8 @@@@ fi;; d917 1 a917 2 - FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";; + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; d922 1 a922 7 @@@@ -10463,11 +10563,12 @@@@ OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; - FreeBSD*|NetBSD*|OpenBSD*) + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) if [ "`$CC -dM -E - #include #include #include @@@@ -21044,15 +21146,15 @@@@ @ 1.8 log @Update to Python 2.4.2 Python 2.4.2 is a bugfix release of Python 2.4 - Python 2.4 is now in bugfix-only mode, no new features are being added. More than 60 bugs have been squashed since Python 2.4.1, including bugs that prevented Python working properly on 64 bit AIX and HP/UX. For a detailed list of changes see: http://python.org/2.4.2/NEWS.html @ text @d3 23 a25 3 --- configure.orig 2005-08-07 23:08:42.000000000 +0200 +++ configure 2005-10-01 22:26:48.000000000 +0200 @@@@ -1482,6 +1482,8 @@@@ d34 827 a860 1 @@@@ -3404,7 +3406,7 @@@@ d869 1 a869 1 @@@@ -3828,7 +3830,12 @@@@ d883 1 a883 33 @@@@ -10188,7 +10195,10 @@@@ case "$enable_toolbox_glue" in yes) extra_machdep_objs="Python/mactoolboxglue.o" - extra_undefs="-u _PyMac_Error" + case $ac_sys_release in + 7*) extra_undefs=;; + *) extra_undefs="-u _PyMac_Error";; + esac cat >>confdefs.h <<\_ACEOF #define USE_TOOLBOX_OBJECT_GLUE 1 @@@@ -10334,7 +10344,7 @@@@ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -undefined suppress" + LDSHARED="$LDSHARED -flat_namespace -undefined suppress" fi ;; Darwin/1.4*|Darwin/5.*|Darwin/6.*) LDSHARED='$(CC) $(LDFLAGS) -bundle' @@@@ -10344,8 +10354,8 @@@@ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). @@@@ -10364,12 +10374,12 @@@@ d899 1 a899 1 @@@@ -10378,7 +10388,8 @@@@ d909 1 a909 1 @@@@ -10410,7 +10421,9 @@@@ a913 1 + Darwin/7*) CCSHARED="-fPIC -fno-common";; d919 1 a919 1 @@@@ -10463,11 +10476,12 @@@@ d933 1 a933 1 @@@@ -14337,6 +14351,7 @@@@ d941 19 @ 1.7 log @Fix problem where LDFLAGS is not being expanded on the command line. Patch supplied by KISHIMOTO, Makoto Closes PR 31027 @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.6 2005/05/09 20:37:51 recht Exp $ d3 2 a4 2 --- configure.orig 2005-03-29 01:23:02.000000000 +0200 +++ configure 2005-05-09 21:14:53.000000000 +0200 d14 1 a14 1 @@@@ -3402,7 +3404,7 @@@@ d23 1 a23 1 @@@@ -3826,7 +3828,12 @@@@ d37 1 a37 1 @@@@ -10186,7 +10193,10 @@@@ d49 1 a49 1 @@@@ -10332,7 +10342,7 @@@@ d58 1 a58 1 @@@@ -10342,8 +10352,8 @@@@ d69 1 a69 1 @@@@ -10362,12 +10372,12 @@@@ d85 1 a85 1 @@@@ -10376,7 +10386,8 @@@@ d95 1 a95 1 @@@@ -10408,7 +10419,9 @@@@ d106 1 a106 1 @@@@ -10461,11 +10474,12 @@@@ d120 1 a120 1 @@@@ -14335,6 +14349,7 @@@@ @ 1.6 log @update to Python 2.4.1 Highlights of this new release include: - Bug fixes. According to the release notes, several dozen bugs have been fixed, including a fix for the SimpleXMLRPCServer security issue (PSF-2005-001). Also add a patch by Joerg Sonnenberger to add basic support for DragonFly BSD. For a detailed list of changes see: http://python.org/2.4.1/NEWS.html @ text @d1 1 a1 1 $NetBSD$ d81 1 a81 1 + Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';; d90 2 a91 2 + NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';; + Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack @ 1.6.2.1 log @Pullup ticket 727 - requested by D'Arcy J.M. Cain build fix for python24 modules Revisions pulled up: - pkgsrc/lang/python24/Makefile 1.11 - pkgsrc/lang/python24/distinfo 1.13 - pkgsrc/lang/python24/patches/patch-al 1.7 Module Name: pkgsrc Committed By: darcy Date: Wed Aug 31 12:13:03 UTC 2005 Modified Files: pkgsrc/lang/python24: distinfo pkgsrc/lang/python24/patches: patch-al Log Message: Fix problem where LDFLAGS is not being expanded on the command line. Patch supplied by KISHIMOTO, Makoto Closes PR 31027 --- Module Name: pkgsrc Committed By: darcy Date: Thu Sep 1 13:14:35 UTC 2005 Modified Files: pkgsrc/lang/python24: Makefile Log Message: Bump PKGREVISION for change made to patches/patch-al in revision 1.7 as suggested by Lubomir Sedlacik in discussions on releng-pkgsrc and pullup request 727. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $ d81 1 a81 1 + Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; d90 2 a91 2 + NetBSD*|DragonFly*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; + Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack @ 1.5 log @Pull in first-stab Interix support from lang/python23. @ text @d3 3 a5 3 --- configure.orig 2004-11-06 20:24:12.000000000 -0500 +++ configure @@@@ -1479,6 +1479,8 @@@@ case $ac_sys_system/$ac_sys_release in d14 1 a14 1 @@@@ -3392,7 +3394,7 @@@@ _ACEOF d19 1 a19 1 + Linux*|GNU*|NetBSD*|FreeBSD*|Interix*) d23 1 a23 16 @@@@ -3418,6 +3420,14 @@@@ _ACEOF BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib} ;; + Darwin*) + if test -z "$enable_framework"; then + LDLIBRARY='libpython$(VERSION).dylib' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH} + fi + ;; + esac else # shared is disabled case $ac_sys_system in @@@@ -3816,7 +3826,12 @@@@ echo "${ECHO_T}$ac_cv_no_strict_aliasing d37 1 a37 1 @@@@ -10165,7 +10180,10 @@@@ fi d49 2 a50 2 @@@@ -10295,7 +10313,7 @@@@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' d58 2 a59 2 @@@@ -10305,8 +10323,8 @@@@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' d69 2 a70 2 @@@@ -10324,12 +10342,12 @@@@ then LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' d85 1 a85 1 @@@@ -10338,7 +10356,8 @@@@ then d90 1 a90 1 + NetBSD*) LDSHARED='$(CC) -shared ${LDFLAGS}';; d95 1 a95 1 @@@@ -10370,7 +10389,9 @@@@ then d99 1 d101 1 a101 1 FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";; d106 7 a112 1 @@@@ -10428,6 +10449,7 @@@@ then d120 1 a120 1 @@@@ -14297,6 +14319,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF @ 1.4 log @Honor LDFLAGS when building shared libraries on Linux. Previously, python2[34]{,-pth} failed on Linux when Berkeley DB from pkgsrc was used. @ text @d3 1 a3 1 --- configure.orig 2004-11-06 19:24:12.000000000 -0600 d14 9 d100 11 a110 1 @@@@ -10370,6 +10388,7 @@@@ then d116 1 d119 10 a128 1 @@@@ -14297,6 +14316,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF @ 1.3 log @fix missed from previous: Darwin 7.x doesn't appear to want the "-u PyMac_Error" when linking the shared library. @ text @d3 1 a3 1 --- configure.orig 2004-11-07 12:24:12.000000000 +1100 d75 1 a75 1 @@@@ -10324,8 +10342,8 @@@@ then d86 5 @ 1.2 log @Darwin build fixes: - ignore poll() - needs dlopen.buildlink3.mk - pass -fPIC -fno-common to CC for objects being linked into a shared library @ text @d43 13 a55 1 @@@@ -10295,7 +10310,7 @@@@ then d64 1 a64 1 @@@@ -10305,8 +10320,8 @@@@ then d75 1 a75 1 @@@@ -10324,8 +10339,8 @@@@ then d86 1 a86 1 @@@@ -10370,6 +10385,7 @@@@ then d94 1 a94 1 @@@@ -14297,6 +14313,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- configure.orig Sun Dec 5 22:09:59 2004 +++ configure Sun Dec 5 22:12:25 2004 @@@@ -1479,6 +1479,8 @@@@ d14 1 a14 1 @@@@ -3418,6 +3420,14 @@@@ d29 1 a29 1 @@@@ -3816,7 +3826,12 @@@@ d43 1 a43 1 @@@@ -10295,7 +10310,7 @@@@ d52 1 a52 1 @@@@ -10305,8 +10320,8 @@@@ d63 1 a63 1 @@@@ -10324,8 +10339,8 @@@@ d74 9 a82 1 @@@@ -14297,6 +14312,7 @@@@ @ 1.1.1.1 log @initial import of Python 2.4 Python is an interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. For an introduction to programming in Python you are referred to the Python Tutorial. The Python Library Reference documents built-in and standard types, constants, functions and modules. Finally, the Python Reference Manual describes the syntax and semantics of the core language in (perhaps too) much detail. Python's basic power can be extended with your own modules written in C or C++. On most systems such modules may be dynamically loaded. Python is also adaptable as an exten- sion language for existing applications. See the internal documentation for hints. This package has been compiled without support for threads. @ text @@