From 34597cea167187ff17c9b4451daae79973f561ab Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 26 Dec 2020 06:17:15 -0600 Subject: [PATCH 1/3] cross-arm-none-eabi-gdb: rebuild against babeltrace --- srcpkgs/cross-arm-none-eabi-gdb/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template index 798295baef8..185641ff68b 100644 --- a/srcpkgs/cross-arm-none-eabi-gdb/template +++ b/srcpkgs/cross-arm-none-eabi-gdb/template @@ -3,7 +3,7 @@ _triplet=arm-none-eabi _pkgname=gdb pkgname=cross-${_triplet}-${_pkgname} version=8.3 -revision=1 +revision=2 wrksrc="${_pkgname}-${version}" build_style=gnu-configure pycompile_dirs="/usr/share/${_pkgname}" @@ -24,14 +24,15 @@ configure_args=" $(vopt_with python) " hostmakedepends="autoconf automake bison flex pkg-config texinfo" -makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel readline-devel zlib-devel $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel gettext-libs')" +makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel readline-devel + zlib-devel $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel gettext-libs')" short_desc="GNU Debugger" maintainer="Ivan Sokolov " license="GPL-3.0-or-later" -homepage="https://www.gnu.org/software/${_pkgname}" +homepage="https://www.gnu.org/software/gdb" distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz" checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e -python_version=2 #unverified +python_version=3 build_options="guile python" # don't enable guile and python interfaces until they are moved into # platform independent packages From 5feeabd0f53a945bee5eaeb0096cccd797eed019 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 26 Dec 2020 09:22:59 -0600 Subject: [PATCH 2/3] linux-tools: rebuild against babeltrace --- srcpkgs/linux-tools/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 2d3c4f038e9..e33794445c5 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools version=5.4.42 -revision=3 +revision=4 wrksrc="linux-${version}" build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto" @@ -108,9 +108,6 @@ do_install() { printf 'usbip-core\nusbip-host\n' > \ ${DESTDIR}/usr/lib/modules-load.d/usbip.conf - if [ -d ${DESTDIR}/usr/lib64 ]; then - mv ${DESTDIR}/usr/lib64/* ${DESTDIR}/usr/lib/ - fi rm -f ${DESTDIR}/usr/include/cpuidle.h } From 115ef520b67ebc7f00976034a51147a3a71b0108 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 24 Dec 2020 14:49:15 -0600 Subject: [PATCH 3/3] babeltrace: update to 2.0.0. --- common/shlibs | 5 +++-- srcpkgs/babeltrace/template | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 24e2df09f9d..bcacccc4671 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2689,8 +2689,9 @@ liblttng-ust-cyg-profile.so.0 lttng-ust-2.7.2_1 liblttng-ust-cyg-profile-fast.so.0 lttng-ust-2.7.2_1 liblttng-ust-dl.so.0 lttng-ust-2.7.2_1 liblttng-ust-tracepoint.so.0 lttng-ust-2.7.2_1 -libbabeltrace.so.1 babeltrace-1.5.3_1 -libbabeltrace-ctf.so.1 babeltrace-1.5.3_1 +libbabeltrace2.so.0 babeltrace-2.0.0_1 +libbabeltrace2-ctf.so.0 babeltrace-2.0.0_1 +libbabeltrace2-ctf-writer.so.0 babeltrace-2.0.0_1 libbabeltrace-ctf-text.so.1 babeltrace-1.5.3_1 libbabeltrace-ctf-metadata.so.1 babeltrace-1.5.3_1 libbabeltrace-dummy.so.1 babeltrace-1.5.3_1 diff --git a/srcpkgs/babeltrace/template b/srcpkgs/babeltrace/template index 0870ccf37a6..4ce94cc2bf1 100644 --- a/srcpkgs/babeltrace/template +++ b/srcpkgs/babeltrace/template @@ -1,6 +1,6 @@ # Template file for 'babeltrace' pkgname=babeltrace -version=1.5.8 +version=2.0.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Alexander Egorenkov " license="MIT, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://diamon.org/babeltrace" distfiles="https://www.efficios.com/files/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=9ff143e4d1d7f1902b05542ac8f1747fb2d7e0ca31c6fa39ccae5765e11d6fc2 +checksum=4511441d98066fdfa00668f1c46036cc81c4582e3802cf861aab5e60960ebfde if [ "$CROSS_BUILD" ]; then # configure_args+=" ac_cv_lib_elf_elf_version=0.170"