Control: tags -1 + patch pending Hi, to go forward with this, and build compilers with python3 compatible pretty printers, I uploaded this patch to delayed/3.
Matthias
diff -Nru gdb-7.6.2/debian/changelog gdb-7.6.2/debian/changelog --- gdb-7.6.2/debian/changelog 2014-01-18 17:08:09.000000000 +0000 +++ gdb-7.6.2/debian/changelog 2014-05-03 13:56:54.000000000 +0000 @@ -1,3 +1,10 @@ +gdb (7.6.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build using python3. Closes: #727003. + + -- Matthias Klose <[email protected]> Sat, 03 May 2014 15:56:03 +0200 + gdb (7.6.2-1) unstable; urgency=low * Imported upstream version 7.6.2 diff -Nru gdb-7.6.2/debian/control gdb-7.6.2/debian/control --- gdb-7.6.2/debian/control 2014-01-18 17:07:16.000000000 +0000 +++ gdb-7.6.2/debian/control 2014-05-03 14:00:46.000000000 +0000 @@ -32,7 +32,7 @@ zlib1g-dev, libbz2-dev, liblzma-dev, - python-dev, + python3-dev, libkvm-dev [kfreebsd-any], libunwind7-dev [ia64], Vcs-Git: git://anonscm.debian.org/crosstoolchain/gdb.git diff -Nru gdb-7.6.2/debian/control.in gdb-7.6.2/debian/control.in --- gdb-7.6.2/debian/control.in 2014-01-18 17:07:05.000000000 +0000 +++ gdb-7.6.2/debian/control.in 2014-05-03 13:58:43.000000000 +0000 @@ -32,7 +32,7 @@ zlib1g-dev, libbz2-dev, liblzma-dev, - python-dev, + python3-dev, libkvm-dev [kfreebsd-any], libunwind7-dev [ia64], Vcs-Git: git://anonscm.debian.org/crosstoolchain/gdb.git diff -Nru gdb-7.6.2/debian/patches/python-config.patch gdb-7.6.2/debian/patches/python-config.patch --- gdb-7.6.2/debian/patches/python-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ gdb-7.6.2/debian/patches/python-config.patch 2014-05-03 13:58:06.000000000 +0000 @@ -0,0 +1,183 @@ +Index: b/gdb/configure.ac +=================================================================== +--- a/gdb/configure.ac ++++ b/gdb/configure.ac +@@ -835,29 +835,31 @@ + esac + esac + ++ python_config= + if test "${python_prog}" != missing; then ++ AC_CHECK_TOOL(python_config,[${python_prog}-config],[${python_prog} ${srcdir}/python/python-config.py]) + # We have a python program to use, but it may be too old. + # Don't flag an error for --with-python=auto (the default). + have_python_config=yes +- python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes` ++ python_includes=`${python_config} --includes` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- AC_ERROR(failure running python-config --includes) ++ AC_ERROR(failure running ${python-config} --includes) + fi + fi +- python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags` ++ python_libs=`${python_config} --ldflags` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- AC_ERROR(failure running python-config --ldflags) ++ AC_ERROR(failure running ${python-config} --ldflags) + fi + fi +- python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` ++ python_prefix=`${python_config} --exec-prefix` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- AC_ERROR(failure running python-config --exec-prefix) ++ AC_ERROR(failure running ${python-config} --exec-prefix) + fi + fi + else +Index: b/gdb/configure +=================================================================== +--- a/gdb/configure ++++ b/gdb/configure +@@ -656,6 +656,7 @@ + PYTHON_LIBS + PYTHON_CPPFLAGS + PYTHON_CFLAGS ++python_config + python_prog_path + LTLIBEXPAT + LIBEXPAT +@@ -8104,29 +8105,122 @@ + esac + esac + ++ python_config= + if test "${python_prog}" != missing; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}${python_prog}-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}${python_prog}-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_python_config+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$python_config"; then ++ ac_cv_prog_python_config="$python_config" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_python_config="${ac_tool_prefix}${python_prog}-config" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++python_config=$ac_cv_prog_python_config ++if test -n "$python_config"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_config" >&5 ++$as_echo "$python_config" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_python_config"; then ++ ac_ct_python_config=$python_config ++ # Extract the first word of "${python_prog}-config", so it can be a program name with args. ++set dummy ${python_prog}-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_python_config+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_python_config"; then ++ ac_cv_prog_ac_ct_python_config="$ac_ct_python_config" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_python_config="${python_prog}-config" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_python_config=$ac_cv_prog_ac_ct_python_config ++if test -n "$ac_ct_python_config"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_python_config" >&5 ++$as_echo "$ac_ct_python_config" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_python_config" = x; then ++ python_config="${python_prog} ${srcdir}/python/python-config.py" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ python_config=$ac_ct_python_config ++ fi ++else ++ python_config="$ac_cv_prog_python_config" ++fi ++ + # We have a python program to use, but it may be too old. + # Don't flag an error for --with-python=auto (the default). + have_python_config=yes +- python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes` ++ python_includes=`${python_config} --includes` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- as_fn_error "failure running python-config --includes" "$LINENO" 5 ++ as_fn_error "failure running ${python-config} --includes" "$LINENO" 5 + fi + fi +- python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags` ++ python_libs=`${python_config} --ldflags` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- as_fn_error "failure running python-config --ldflags" "$LINENO" 5 ++ as_fn_error "failure running ${python-config} --ldflags" "$LINENO" 5 + fi + fi +- python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` ++ python_prefix=`${python_config} --exec-prefix` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then +- as_fn_error "failure running python-config --exec-prefix" "$LINENO" 5 ++ as_fn_error "failure running ${python-config} --exec-prefix" "$LINENO" 5 + fi + fi + else diff -Nru gdb-7.6.2/debian/patches/series gdb-7.6.2/debian/patches/series --- gdb-7.6.2/debian/patches/series 2014-01-18 13:27:33.000000000 +0000 +++ gdb-7.6.2/debian/patches/series 2014-05-03 13:57:52.000000000 +0000 @@ -6,3 +6,4 @@ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch upstream-print_insn_rl78-workaround.patch upstream-arm-catch-syscall.patch +python-config.patch diff -Nru gdb-7.6.2/debian/rules gdb-7.6.2/debian/rules --- gdb-7.6.2/debian/rules 2014-01-18 15:21:45.000000000 +0000 +++ gdb-7.6.2/debian/rules 2014-05-03 13:59:37.000000000 +0000 @@ -128,7 +128,7 @@ # Debian does not include 64-bit Python packages, so --with-python # is here rather than in EXTRA_FLAGS. DEB_CONFIGURE_EXTRA_FLAGS := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \ - --enable-tui --with-python + --enable-tui --with-python=python3 # 64-bit flags DEB_CONFIGURE_FLAGS_64 := --host=$(HOST64) $(EXTRA_FLAGS) \
