Date: Tuesday, June 8, 2021 @ 17:41:38 Author: anatolik Revision: 959769
archrelease: copy trunk to community-x86_64 Added: arm-none-eabi-gdb/repos/community-x86_64/PKGBUILD (from rev 959768, arm-none-eabi-gdb/trunk/PKGBUILD) arm-none-eabi-gdb/repos/community-x86_64/fix_python37.patch (from rev 959768, arm-none-eabi-gdb/trunk/fix_python37.patch) Deleted: arm-none-eabi-gdb/repos/community-x86_64/PKGBUILD arm-none-eabi-gdb/repos/community-x86_64/fix_python37.patch --------------------+ PKGBUILD | 109 +++++++++++++++++++++--------------------- fix_python37.patch | 132 +++++++++++++++++++++++++-------------------------- 2 files changed, 121 insertions(+), 120 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-06-08 17:40:13 UTC (rev 959768) +++ PKGBUILD 2021-06-08 17:41:38 UTC (rev 959769) @@ -1,54 +0,0 @@ -# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> -# Contributor: Martin Schmölzer <mschmoel...@gmail.com> - -_target=arm-none-eabi -pkgname=$_target-gdb -pkgver=10.2 -pkgrel=1 -pkgdesc='The GNU Debugger for the ARM EABI (bare-metal) target' -arch=(x86_64) -url='https://www.gnu.org/software/gdb/' -license=(GPL3) -depends=(xz ncurses expat python guile gdb-common mpfr libelf) -optdepends=('stlink: for debugging over STLINK') -options=(!emptydirs) -source=(https://ftp.gnu.org/gnu/gdb/gdb-$pkgver.tar.xz{,.sig}) -sha256sums=('aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29' - 'SKIP') -validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker <brobec...@adacore.com> - -prepare() { - cd gdb-$pkgver - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure -} - -build() { - cd gdb-$pkgver - - mkdir -p build && cd build - ../configure \ - --target=$_target \ - --prefix=/usr \ - --enable-languages=c,c++ \ - --enable-multilib \ - --enable-interwork \ - --with-system-readline \ - --disable-nls \ - --with-python=/usr/bin/python \ - --with-guile=guile-2.2 \ - --with-system-gdbinit=/etc/gdb/gdbinit - - make -} - -package() { - cd gdb-$pkgver/build - - make -C gdb DESTDIR="$pkgdir" install - - # Following files conflict with 'gdb'/'gdb-common' packages - rm -r "$pkgdir"/usr/include/gdb/ - rm -r "$pkgdir"/usr/share/gdb/ - rm -r "$pkgdir"/usr/share/info/ - rm -r "$pkgdir"/usr/share/man/man5/ -} Copied: arm-none-eabi-gdb/repos/community-x86_64/PKGBUILD (from rev 959768, arm-none-eabi-gdb/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-06-08 17:41:38 UTC (rev 959769) @@ -0,0 +1,55 @@ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> +# Contributor: Martin Schmölzer <mschmoel...@gmail.com> + +_target=arm-none-eabi +pkgname=$_target-gdb +pkgver=10.2 +pkgrel=2 +pkgdesc='The GNU Debugger for the ARM EABI (bare-metal) target' +arch=(x86_64) +url='https://www.gnu.org/software/gdb/' +license=(GPL3) +depends=(xz ncurses expat python guile gdb-common mpfr libelf source-highlight) +optdepends=('stlink: for debugging over STLINK') +options=(!emptydirs) +source=(https://ftp.gnu.org/gnu/gdb/gdb-$pkgver.tar.xz{,.sig}) +sha256sums=('aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29' + 'SKIP') +validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker <brobec...@adacore.com> + +prepare() { + cd gdb-$pkgver + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure +} + +build() { + cd gdb-$pkgver + + mkdir -p build && cd build + ../configure \ + --target=$_target \ + --prefix=/usr \ + --enable-languages=c,c++ \ + --enable-multilib \ + --enable-interwork \ + --with-system-readline \ + --disable-nls \ + --enable-source-highlight \ + --with-python=/usr/bin/python \ + --with-guile=guile-2.2 \ + --with-system-gdbinit=/etc/gdb/gdbinit + + make +} + +package() { + cd gdb-$pkgver/build + + make -C gdb DESTDIR="$pkgdir" install + + # Following files conflict with 'gdb'/'gdb-common' packages + rm -r "$pkgdir"/usr/include/gdb/ + rm -r "$pkgdir"/usr/share/gdb/ + rm -r "$pkgdir"/usr/share/info/ + rm -r "$pkgdir"/usr/share/man/man5/ +} Deleted: fix_python37.patch =================================================================== --- fix_python37.patch 2021-06-08 17:40:13 UTC (rev 959768) +++ fix_python37.patch 2021-06-08 17:41:38 UTC (rev 959769) @@ -1,66 +0,0 @@ -From aeab512851bf6ed623d1c6c4305b6ce05e51a10c Mon Sep 17 00:00:00 2001 -From: Paul Koning <paul_kon...@dell.com> -Date: Fri, 8 Jun 2018 13:26:36 -0400 -Subject: [PATCH] Fix build issue with Python 3.7 - -Originally reported in -https://bugzilla.redhat.com/show_bug.cgi?id=1577396 -- gdb build fails -with Python 3.7 due to references to a Python internal function whose -declaration changed in 3.7. - -gdb/ChangeLog -2018-06-08 Paul Koning <paul_kon...@dell.com> - - PR gdb/23252 - - * python/python.c (do_start_initialization): - Avoid call to internal Python API. - (init__gdb_module): New function. ---- - gdb/ChangeLog | 8 ++++++++ - gdb/python/python.c | 18 +++++++++++++++--- - 2 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index 1805c906284..20fc674f20a 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) - restore_active_ext_lang (previous_active); - } - -+#ifdef IS_PY3K -+/* This is called via the PyImport_AppendInittab mechanism called -+ during initialization, to make the built-in _gdb module known to -+ Python. */ -+PyMODINIT_FUNC -+init__gdb_module (void) -+{ -+ return PyModule_Create (&python_GdbModuleDef); -+} -+#endif -+ - static bool - do_start_initialization () - { -@@ -1707,6 +1718,9 @@ do_start_initialization () - remain alive for the duration of the program's execution, so - it is not freed after this call. */ - Py_SetProgramName (progname_copy); -+ -+ /* Define _gdb as a built-in module. */ -+ PyImport_AppendInittab ("_gdb", init__gdb_module); - #else - Py_SetProgramName (progname.release ()); - #endif -@@ -1716,9 +1730,7 @@ do_start_initialization () - PyEval_InitThreads (); - - #ifdef IS_PY3K -- gdb_module = PyModule_Create (&python_GdbModuleDef); -- /* Add _gdb module to the list of known built-in modules. */ -- _PyImport_FixupBuiltin (gdb_module, "_gdb"); -+ gdb_module = PyImport_ImportModule ("_gdb"); - #else - gdb_module = Py_InitModule ("_gdb", python_GdbMethods); - #endif Copied: arm-none-eabi-gdb/repos/community-x86_64/fix_python37.patch (from rev 959768, arm-none-eabi-gdb/trunk/fix_python37.patch) =================================================================== --- fix_python37.patch (rev 0) +++ fix_python37.patch 2021-06-08 17:41:38 UTC (rev 959769) @@ -0,0 +1,66 @@ +From aeab512851bf6ed623d1c6c4305b6ce05e51a10c Mon Sep 17 00:00:00 2001 +From: Paul Koning <paul_kon...@dell.com> +Date: Fri, 8 Jun 2018 13:26:36 -0400 +Subject: [PATCH] Fix build issue with Python 3.7 + +Originally reported in +https://bugzilla.redhat.com/show_bug.cgi?id=1577396 -- gdb build fails +with Python 3.7 due to references to a Python internal function whose +declaration changed in 3.7. + +gdb/ChangeLog +2018-06-08 Paul Koning <paul_kon...@dell.com> + + PR gdb/23252 + + * python/python.c (do_start_initialization): + Avoid call to internal Python API. + (init__gdb_module): New function. +--- + gdb/ChangeLog | 8 ++++++++ + gdb/python/python.c | 18 +++++++++++++++--- + 2 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/gdb/python/python.c b/gdb/python/python.c +index 1805c906284..20fc674f20a 100644 +--- a/gdb/python/python.c ++++ b/gdb/python/python.c +@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) + restore_active_ext_lang (previous_active); + } + ++#ifdef IS_PY3K ++/* This is called via the PyImport_AppendInittab mechanism called ++ during initialization, to make the built-in _gdb module known to ++ Python. */ ++PyMODINIT_FUNC ++init__gdb_module (void) ++{ ++ return PyModule_Create (&python_GdbModuleDef); ++} ++#endif ++ + static bool + do_start_initialization () + { +@@ -1707,6 +1718,9 @@ do_start_initialization () + remain alive for the duration of the program's execution, so + it is not freed after this call. */ + Py_SetProgramName (progname_copy); ++ ++ /* Define _gdb as a built-in module. */ ++ PyImport_AppendInittab ("_gdb", init__gdb_module); + #else + Py_SetProgramName (progname.release ()); + #endif +@@ -1716,9 +1730,7 @@ do_start_initialization () + PyEval_InitThreads (); + + #ifdef IS_PY3K +- gdb_module = PyModule_Create (&python_GdbModuleDef); +- /* Add _gdb module to the list of known built-in modules. */ +- _PyImport_FixupBuiltin (gdb_module, "_gdb"); ++ gdb_module = PyImport_ImportModule ("_gdb"); + #else + gdb_module = Py_InitModule ("_gdb", python_GdbMethods); + #endif