Blame SOURCES/05000-autotool-intermediates.patch

ae2451
diff -up ./configure.autotool-intermediates ./configure
ae2451
--- ./configure.autotool-intermediates	2013-04-09 11:24:01.024185796 +0200
ae2451
+++ ./configure	2013-04-09 11:24:01.780183954 +0200
ae2451
@@ -639,6 +639,8 @@ TRUE
ae2451
 MACHDEP_OBJS
ae2451
 DYNLOADFILE
ae2451
 DLINCLDIR
ae2451
+DTRACEHDRS
ae2451
+DTRACEOBJS
ae2451
 THREADOBJ
ae2451
 LDLAST
ae2451
 USE_THREAD_MODULE
ae2451
@@ -659,6 +661,8 @@ OTHER_LIBTOOL_OPT
ae2451
 UNIVERSAL_ARCH_FLAGS
ae2451
 BASECFLAGS
ae2451
 OPT
ae2451
+DEBUG_SUFFIX
ae2451
+DEBUG_EXT
ae2451
 LN
ae2451
 MKDIR_P
ae2451
 INSTALL_DATA
ae2451
@@ -795,8 +799,11 @@ with_pth
ae2451
 enable_ipv6
ae2451
 with_doc_strings
ae2451
 with_tsc
ae2451
+with_count_allocs
ae2451
+with_call_profile
ae2451
 with_pymalloc
ae2451
 with_valgrind
ae2451
+with_dtrace
ae2451
 with_wctype_functions
ae2451
 with_fpectl
ae2451
 with_libm
ae2451
@@ -1472,8 +1479,11 @@ Optional Packages:
ae2451
   --with-pth              use GNU pth threading libraries
ae2451
   --with(out)-doc-strings disable/enable documentation strings
ae2451
   --with(out)-tsc         enable/disable timestamp counter profile
ae2451
+  --with(out)count-allocs  enable/disable per-type instance accounting
ae2451
+  --with(out)-call-profile  enable/disable statistics on function call invocation
ae2451
   --with(out)-pymalloc    disable/enable specialized mallocs
ae2451
   --with-valgrind         Enable Valgrind support
ae2451
+  --with(out)-dtrace      disable/enable dtrace support
ae2451
   --with-wctype-functions use wctype.h functions
ae2451
   --with-fpectl           enable SIGFPE catching
ae2451
   --with-libm=STRING      math library
ae2451
@@ -5171,7 +5181,7 @@ esac
ae2451
 $as_echo_n "checking LIBRARY... " >&6; }
ae2451
 if test -z "$LIBRARY"
ae2451
 then
ae2451
-	LIBRARY='libpython$(VERSION).a'
ae2451
+	LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a'
ae2451
 fi
ae2451
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
ae2451
 $as_echo "$LIBRARY" >&6; }
ae2451
@@ -5343,8 +5353,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
ae2451
 	  INSTSONAME="$LDLIBRARY".$SOVERSION
ae2451
           ;;
ae2451
     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
ae2451
-	  LDLIBRARY='libpython$(VERSION).so'
ae2451
-	  BLDLIBRARY='-L. -lpython$(VERSION)'
ae2451
+	  LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so'
ae2451
+	  BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)'
ae2451
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
ae2451
 	  case $ac_sys_system in
ae2451
 	      FreeBSD*)
ae2451
@@ -5367,7 +5377,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
ae2451
 	  ;;
ae2451
     OSF*)
ae2451
 	  LDLIBRARY='libpython$(VERSION).so'
ae2451
-	  BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
ae2451
+	  BLDLIBRARY='-L. -lpython$(VERSION)'
ae2451
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
ae2451
 	  ;;
ae2451
     atheos*)
ae2451
@@ -5894,6 +5904,14 @@ $as_echo "no" >&6; }
ae2451
 fi
ae2451
 
ae2451
 
ae2451
+if test "$Py_DEBUG" = 'true'
ae2451
+then
ae2451
+	DEBUG_EXT=_d
ae2451
+	DEBUG_SUFFIX=-debug
ae2451
+fi
ae2451
+
ae2451
+
ae2451
+
ae2451
 # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
ae2451
 # merged with this chunk of code?
ae2451
 
ae2451
@@ -9958,6 +9976,50 @@ $as_echo "no" >&6; }
ae2451
 fi
ae2451
 
ae2451
 
ae2451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5
ae2451
+$as_echo_n "checking for --with-count-allocs... " >&6; }
ae2451
+
ae2451
+# Check whether --with-count-allocs was given.
ae2451
+if test "${with_count_allocs+set}" = set; then :
ae2451
+  withval=$with_count_allocs;
ae2451
+if test "$withval" != no
ae2451
+then
ae2451
+
ae2451
+$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h
ae2451
+
ae2451
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
ae2451
+$as_echo "yes" >&6; }
ae2451
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ae2451
+$as_echo "no" >&6; }
ae2451
+fi
ae2451
+else
ae2451
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ae2451
+$as_echo "no" >&6; }
ae2451
+fi
ae2451
+
ae2451
+
ae2451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5
ae2451
+$as_echo_n "checking for --with-call-profile... " >&6; }
ae2451
+
ae2451
+# Check whether --with-call-profile was given.
ae2451
+if test "${with_call_profile+set}" = set; then :
ae2451
+  withval=$with_call_profile;
ae2451
+if test "$withval" != no
ae2451
+then
ae2451
+
ae2451
+$as_echo "#define CALL_PROFILE 1" >>confdefs.h
ae2451
+
ae2451
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
ae2451
+$as_echo "yes" >&6; }
ae2451
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ae2451
+$as_echo "no" >&6; }
ae2451
+fi
ae2451
+else
ae2451
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ae2451
+$as_echo "no" >&6; }
ae2451
+fi
ae2451
+
ae2451
+
ae2451
 # Check for Python-specific malloc support
ae2451
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
ae2451
 $as_echo_n "checking for --with-pymalloc... " >&6; }
ae2451
@@ -10007,6 +10069,46 @@ fi
ae2451
 
ae2451
 fi
ae2451
 
ae2451
+# Check for dtrace support
ae2451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5
ae2451
+$as_echo_n "checking for --with-dtrace... " >&6; }
ae2451
+
ae2451
+# Check whether --with-dtrace was given.
ae2451
+if test "${with_dtrace+set}" = set; then :
ae2451
+  withval=$with_dtrace;
ae2451
+fi
ae2451
+
ae2451
+
ae2451
+if test ! -z "$with_dtrace"
ae2451
+then
ae2451
+    if dtrace -G -o /dev/null -s $srcdir/Include/pydtrace.d 2>/dev/null
ae2451
+    then
ae2451
+
ae2451
+$as_echo "#define WITH_DTRACE 1" >>confdefs.h
ae2451
+
ae2451
+	with_dtrace="Sun"
ae2451
+	DTRACEOBJS="Python/dtrace.o"
ae2451
+	DTRADEHDRS=""
ae2451
+    elif dtrace -h -o /dev/null -s $srcdir/Include/pydtrace.d
ae2451
+    then
ae2451
+
ae2451
+$as_echo "#define WITH_DTRACE 1" >>confdefs.h
ae2451
+
ae2451
+	with_dtrace="Apple"
ae2451
+	DTRACEOBJS=""
ae2451
+	DTRADEHDRS="pydtrace.h"
ae2451
+    else
ae2451
+	with_dtrace="no"
ae2451
+    fi
ae2451
+else
ae2451
+    with_dtrace="no"
ae2451
+fi
ae2451
+
ae2451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5
ae2451
+$as_echo "$with_dtrace" >&6; }
ae2451
+
ae2451
+
ae2451
+
ae2451
 # Check for --with-wctype-functions
ae2451
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wctype-functions" >&5
ae2451
 $as_echo_n "checking for --with-wctype-functions... " >&6; }
ae2451
diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
ae2451
--- ./pyconfig.h.in.autotool-intermediates	2013-04-09 11:24:01.020185806 +0200
ae2451
+++ ./pyconfig.h.in	2013-04-09 11:24:02.088183204 +0200
ae2451
@@ -18,6 +18,12 @@
ae2451
 /* Define this if you have BeOS threads. */
ae2451
 #undef BEOS_THREADS
ae2451
 
ae2451
+/* Define to keep records on function call invocation */
ae2451
+#undef CALL_PROFILE
ae2451
+
ae2451
+/* Define to keep records of the number of instances of each type */
ae2451
+#undef COUNT_ALLOCS
ae2451
+
ae2451
 /* Define if you have the Mach cthreads package */
ae2451
 #undef C_THREADS
ae2451
 
ae2451
@@ -1119,12 +1125,6 @@
ae2451
 /* Define to profile with the Pentium timestamp counter */
ae2451
 #undef WITH_TSC
ae2451
 
ae2451
-/* Define to keep records of the number of instances of each type */
ae2451
-#undef COUNT_ALLOCS
ae2451
-
ae2451
-/* Define to keep records on function call invocation */
ae2451
-#undef CALL_PROFILE
ae2451
-
ae2451
 /* Define if you want pymalloc to be disabled when running under valgrind */
ae2451
 #undef WITH_VALGRIND
ae2451