python/patches/05000-autotool-intermediates.patch

   1 diff -up ./configure.autotool-intermediates ./configure
   2 --- ./configure.autotool-intermediates  2013-04-09 11:24:01.024185796 +0200
   3 +++ ./configure 2013-04-09 11:24:01.780183954 +0200
   4 @@ -639,6 +639,8 @@ TRUE
   5  MACHDEP_OBJS
   6  DYNLOADFILE
   7  DLINCLDIR
   8 +DTRACEHDRS
   9 +DTRACEOBJS
  10  THREADOBJ
  11  LDLAST
  12  USE_THREAD_MODULE
  13 @@ -659,6 +661,8 @@ OTHER_LIBTOOL_OPT
  14  UNIVERSAL_ARCH_FLAGS
  15  BASECFLAGS
  16  OPT
  17 +DEBUG_SUFFIX
  18 +DEBUG_EXT
  19  LN
  20  MKDIR_P
  21  INSTALL_DATA
  22 @@ -795,8 +799,11 @@ with_pth
  23  enable_ipv6
  24  with_doc_strings
  25  with_tsc
  26 +with_count_allocs
  27 +with_call_profile
  28  with_pymalloc
  29  with_valgrind
  30 +with_dtrace
  31  with_wctype_functions
  32  with_fpectl
  33  with_libm
  34 @@ -1472,8 +1479,11 @@ Optional Packages:
  35    --with-pth              use GNU pth threading libraries
  36    --with(out)-doc-strings disable/enable documentation strings
  37    --with(out)-tsc         enable/disable timestamp counter profile
  38 +  --with(out)count-allocs  enable/disable per-type instance accounting
  39 +  --with(out)-call-profile  enable/disable statistics on function call invocation
  40    --with(out)-pymalloc    disable/enable specialized mallocs
  41    --with-valgrind         Enable Valgrind support
  42 +  --with(out)-dtrace      disable/enable dtrace support
  43    --with-wctype-functions use wctype.h functions
  44    --with-fpectl           enable SIGFPE catching
  45    --with-libm=STRING      math library
  46 @@ -5171,7 +5181,7 @@ esac
  47  $as_echo_n "checking LIBRARY... " >&6; }
  48  if test -z "$LIBRARY"
  49  then
  50 -       LIBRARY='libpython$(VERSION).a'
  51 +       LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a'
  52  fi
  53  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
  54  $as_echo "$LIBRARY" >&6; }
  55 @@ -5343,8 +5353,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  56           INSTSONAME="$LDLIBRARY".$SOVERSION
  57            ;;
  58      Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
  59 -         LDLIBRARY='libpython$(VERSION).so'
  60 -         BLDLIBRARY='-L. -lpython$(VERSION)'
  61 +         LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so'
  62 +         BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)'
  63           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  64           case $ac_sys_system in
  65               FreeBSD*)
  66 @@ -5367,7 +5377,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  67           ;;
  68      OSF*)
  69           LDLIBRARY='libpython$(VERSION).so'
  70 -         BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
  71 +         BLDLIBRARY='-L. -lpython$(VERSION)'
  72           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  73           ;;
  74      atheos*)
  75 @@ -5894,6 +5904,14 @@ $as_echo "no" >&6; }
  76  fi
  77
  78
  79 +if test "$Py_DEBUG" = 'true'
  80 +then
  81 +       DEBUG_EXT=_d
  82 +       DEBUG_SUFFIX=-debug
  83 +fi
  84 +
  85 +
  86 +
  87  # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
  88  # merged with this chunk of code?
  89
  90 @@ -9958,6 +9976,50 @@ $as_echo "no" >&6; }
  91  fi
  92
  93
  94 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5
  95 +$as_echo_n "checking for --with-count-allocs... " >&6; }
  96 +
  97 +# Check whether --with-count-allocs was given.
  98 +if test "${with_count_allocs+set}" = set; then :
  99 +  withval=$with_count_allocs;
 100 +if test "$withval" != no
 101 +then
 102 +
 103 +$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h
 104 +
 105 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 106 +$as_echo "yes" >&6; }
 107 +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 108 +$as_echo "no" >&6; }
 109 +fi
 110 +else
 111 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 112 +$as_echo "no" >&6; }
 113 +fi
 114 +
 115 +
 116 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5
 117 +$as_echo_n "checking for --with-call-profile... " >&6; }
 118 +
 119 +# Check whether --with-call-profile was given.
 120 +if test "${with_call_profile+set}" = set; then :
 121 +  withval=$with_call_profile;
 122 +if test "$withval" != no
 123 +then
 124 +
 125 +$as_echo "#define CALL_PROFILE 1" >>confdefs.h
 126 +
 127 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 128 +$as_echo "yes" >&6; }
 129 +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 130 +$as_echo "no" >&6; }
 131 +fi
 132 +else
 133 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 134 +$as_echo "no" >&6; }
 135 +fi
 136 +
 137 +
 138  # Check for Python-specific malloc support
 139  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
 140  $as_echo_n "checking for --with-pymalloc... " >&6; }
 141 @@ -10007,6 +10069,46 @@ fi
 142
 143  fi
 144
 145 +# Check for dtrace support
 146 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5
 147 +$as_echo_n "checking for --with-dtrace... " >&6; }
 148 +
 149 +# Check whether --with-dtrace was given.
 150 +if test "${with_dtrace+set}" = set; then :
 151 +  withval=$with_dtrace;
 152 +fi
 153 +
 154 +
 155 +if test ! -z "$with_dtrace"
 156 +then
 157 +    if dtrace -G -o /dev/null -s $srcdir/Include/pydtrace.d 2>/dev/null
 158 +    then
 159 +
 160 +$as_echo "#define WITH_DTRACE 1" >>confdefs.h
 161 +
 162 +       with_dtrace="Sun"
 163 +       DTRACEOBJS="Python/dtrace.o"
 164 +       DTRADEHDRS=""
 165 +    elif dtrace -h -o /dev/null -s $srcdir/Include/pydtrace.d
 166 +    then
 167 +
 168 +$as_echo "#define WITH_DTRACE 1" >>confdefs.h
 169 +
 170 +       with_dtrace="Apple"
 171 +       DTRACEOBJS=""
 172 +       DTRADEHDRS="pydtrace.h"
 173 +    else
 174 +       with_dtrace="no"
 175 +    fi
 176 +else
 177 +    with_dtrace="no"
 178 +fi
 179 +
 180 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5
 181 +$as_echo "$with_dtrace" >&6; }
 182 +
 183 +
 184 +
 185  # Check for --with-wctype-functions
 186  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wctype-functions" >&5
 187  $as_echo_n "checking for --with-wctype-functions... " >&6; }
 188 diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
 189 --- ./pyconfig.h.in.autotool-intermediates      2013-04-09 11:24:01.020185806 +0200
 190 +++ ./pyconfig.h.in     2013-04-09 11:24:02.088183204 +0200
 191 @@ -18,6 +18,12 @@
 192  /* Define this if you have BeOS threads. */
 193  #undef BEOS_THREADS
 194
 195 +/* Define to keep records on function call invocation */
 196 +#undef CALL_PROFILE
 197 +
 198 +/* Define to keep records of the number of instances of each type */
 199 +#undef COUNT_ALLOCS
 200 +
 201  /* Define if you have the Mach cthreads package */
 202  #undef C_THREADS
 203
 204 @@ -1119,12 +1125,6 @@
 205  /* Define to profile with the Pentium timestamp counter */
 206  #undef WITH_TSC
 207
 208 -/* Define to keep records of the number of instances of each type */
 209 -#undef COUNT_ALLOCS
 210 -
 211 -/* Define to keep records on function call invocation */
 212 -#undef CALL_PROFILE
 213 -
 214  /* Define if you want pymalloc to be disabled when running under valgrind */
 215  #undef WITH_VALGRIND
 216