diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
39 files changed, 597 insertions, 381 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch new file mode 100644 index 000000000..ee0c25473 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch @@ -0,0 +1,94 @@ +An all-in-one patch that fixes several issues: + +1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) +2) powerpc stacktrace implementation only works on glibc (disabled on musl) +3) powerpc stacktrace implementation has ppc64 assumptions (fixed) +4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) + +Sourced from void linux + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/absl/base/internal/unscaledcycleclock.cc ++++ b/absl/base/internal/unscaledcycleclock.cc +@@ -20,7 +20,7 @@ + #include <intrin.h> + #endif + +-#if defined(__powerpc__) || defined(__ppc__) ++#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) + #ifdef __GLIBC__ + #include <sys/platform/ppc.h> + #elif defined(__FreeBSD__) +@@ -59,7 +59,7 @@ double UnscaledCycleClock::Frequency() { + return base_internal::NominalCPUFrequency(); + } + +-#elif defined(__powerpc__) || defined(__ppc__) ++#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) + + int64_t UnscaledCycleClock::Now() { + #ifdef __GLIBC__ +--- a/absl/base/internal/unscaledcycleclock.h ++++ b/absl/base/internal/unscaledcycleclock.h +@@ -46,7 +46,7 @@ + + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ +- defined(__powerpc__) || defined(__ppc__) || \ ++ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ + defined(_M_IX86) || defined(_M_X64) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else +--- a/absl/debugging/internal/examine_stack.cc ++++ b/absl/debugging/internal/examine_stack.cc +@@ -27,6 +27,10 @@ + #include <csignal> + #include <cstdio> + ++#if defined(__powerpc__) ++#include <asm/ptrace.h> ++#endif ++ + #include "absl/base/attributes.h" + #include "absl/base/internal/raw_logging.h" + #include "absl/base/macros.h" +@@ -55,8 +59,10 @@ void* GetProgramCounter(void* vuc) { + return reinterpret_cast<void*>(context->uc_mcontext.pc); + #elif defined(__powerpc64__) + return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); +-#elif defined(__powerpc__) ++#elif defined(__powerpc__) && defined(__GLIBC__) + return reinterpret_cast<void*>(context->uc_mcontext.regs->nip); ++#elif defined(__powerpc__) ++ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip); + #elif defined(__riscv) + return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); + #elif defined(__s390__) && !defined(__s390x__) +--- a/absl/debugging/internal/stacktrace_config.h ++++ b/absl/debugging/internal/stacktrace_config.h +@@ -64,7 +64,7 @@ + #elif defined(__i386__) || defined(__x86_64__) + #define ABSL_STACKTRACE_INL_HEADER \ + "absl/debugging/internal/stacktrace_x86-inl.inc" +-#elif defined(__ppc__) || defined(__PPC__) ++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) + #define ABSL_STACKTRACE_INL_HEADER \ + "absl/debugging/internal/stacktrace_powerpc-inl.inc" + #elif defined(__aarch64__) +--- a/absl/debugging/internal/stacktrace_powerpc-inl.inc ++++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc +@@ -130,8 +130,13 @@ static void **NextStackFrame(void **old_ + StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) { + const ucontext_t* signal_context = + reinterpret_cast<const ucontext_t*>(uc); ++#if defined(__powerpc64__) + void **const sp_before_signal = + reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]); ++#else ++ void **const sp_before_signal = ++ reinterpret_cast<void**>(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]); ++#endif + // Check that alleged sp before signal is nonnull and is reasonably + // aligned. + if (sp_before_signal != nullptr && diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 9557c9345..903b7b4b8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -13,6 +13,7 @@ BRANCH = "lts_2020_09_23" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ + file://abseil-ppc-fixes.patch \ " S = "${WORKDIR}/git" @@ -28,7 +29,6 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ " BBCLASSEXTEND = "native nativesdk" -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "${libdir}/libabsl_*.so ${libdir}/cmake" -FILES_${PN}-dev = "${includedir}" +FILES_${PN} = "${libdir}/libabsl_*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/cmake" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index d93a7f723..e8992346b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -160,8 +160,8 @@ do_install() { PACKAGES =+ "${PN}-fstools ${PN}-adbd" -RDEPENDS_${BPN}-adbd = "${BPN}-conf" -RDEPENDS_${BPN}-fstools = "bash" +RDEPENDS_${PN}-adbd = "${PN}-conf" +RDEPENDS_${PN}-fstools = "bash" FILES_${PN}-adbd = "\ ${bindir}/adbd \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch new file mode 100644 index 000000000..d7a5c0675 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch @@ -0,0 +1,54 @@ +From 70441611d4e8200d9d16dfed493873b8c1bb57c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 15 Mar 2021 11:33:38 -0700 +Subject: [PATCH] Remove HAVE_GETCONTEXT check to add local implementation + +On musl getcontext/setcontext APIs are implemented in libucontext which +can be used + +Upstream-Status: Inappropriate [Musl Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ee7454e4..69700192 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -187,10 +187,6 @@ src_client_linux_libbreakpad_client_a_SOURCES = \ + src/common/linux/linux_libc_support.cc \ + src/common/linux/memory_mapped_file.cc \ + src/common/linux/safe_readlink.cc +-if !HAVE_GETCONTEXT +-src_client_linux_libbreakpad_client_a_SOURCES += \ +- src/common/linux/breakpad_getcontext.S +-endif + endif LINUX_HOST + + if !DISABLE_PROCESSOR +@@ -508,10 +504,6 @@ src_client_linux_linux_client_unittest_shlib_SOURCES = \ + src/processor/minidump.cc \ + src/processor/pathname_stripper.cc \ + src/processor/proc_maps_linux.cc +-if !HAVE_GETCONTEXT +-src_client_linux_linux_client_unittest_shlib_SOURCES += \ +- src/common/linux/breakpad_getcontext.S +-endif + + src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ + $(AM_CPPFLAGS) $(TEST_CFLAGS) +@@ -541,10 +533,6 @@ src_client_linux_linux_client_unittest_shlib_LDADD = \ + src/common/string_conversion.o \ + $(TEST_LIBS) \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) +-if !HAVE_GETCONTEXT +-src_client_linux_linux_client_unittest_shlib_SOURCES += \ +- src/common/linux/breakpad_getcontext_unittest.cc +-endif + if ANDROID_HOST + src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ + -llog -lm +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch index 33bae1a37..6b8d011d8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch @@ -13,11 +13,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/client/linux/crash_generation/crash_generation_server.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc -index 2596afde..2faeb9e5 100644 --- a/src/client/linux/crash_generation/crash_generation_server.cc +++ b/src/client/linux/crash_generation/crash_generation_server.cc -@@ -230,8 +230,18 @@ CrashGenerationServer::ClientEvent(short revents) +@@ -230,8 +230,18 @@ CrashGenerationServer::ClientEvent(short // Walk the control payload and extract the file descriptor and validated pid. pid_t crashing_pid = -1; int signal_fd = -1; @@ -28,7 +26,7 @@ index 2596afde..2faeb9e5 100644 + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wsign-compare" +#endif - for (struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); hdr; + for (struct cmsghdr* hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) { +#ifndef __GLIBC__ + #pragma clang diagnostic pop @@ -36,6 +34,3 @@ index 2596afde..2faeb9e5 100644 if (hdr->cmsg_level != SOL_SOCKET) continue; if (hdr->cmsg_type == SCM_RIGHTS) { --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch deleted file mode 100644 index 466abe5f8..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 57ecf7205feedd23f901e1bb9d193787e559e433 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 23 Jan 2018 15:13:26 -0800 -Subject: [PATCH] disable calls to getcontext() with musl - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -490,7 +490,19 @@ bool ExceptionHandler::SimulateSignalDel - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); - ucontext_t context; -+#if defined(__GLIBC__) - getcontext(&context); -+#else -+ // Extreme hack: Allow musl builds to compile - but don't expect them to work. -+ // Although musl provides a definition for getcontext() in ucontext.h (which -+ // enough to build libbreakpad_client) musl does not provide a corresponding -+ // getcontext() function, so builds will fail when attempting to link anything -+ // with libbreakpad_client. Disabling calls to getcontext() is a temporary -+ // hack. The real fix is probably to enable Breakpad's own implementation of -+ // getcontext() when building for musl (it's currently only enabled when -+ // building for Android). -+ memset (&context, 0, sizeof(context)); -+#endif - return HandleSignal(sig, &siginfo, &context); - } - -@@ -675,9 +687,14 @@ bool ExceptionHandler::WriteMinidump() { - sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); - - CrashContext context; -+#if defined(__GLIBC__) - int getcontext_result = getcontext(&context.context); - if (getcontext_result) - return false; -+#else -+ // Extreme hack - see comments above. -+ memset (&context.context, 0, sizeof(context.context)); -+#endif - - #if defined(__i386__) - // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch index 4583d601a..3dc55cf1f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch @@ -7,22 +7,20 @@ Subject: [PATCH 1/3] include <sys/reg.h> to get __WORDSIZE on musl libc src/common/linux/elf_core_dump.h | 1 + 1 file changed, 1 insertion(+) -Index: git/src/common/linux/elf_core_dump.h -=================================================================== ---- git.orig/src/common/linux/elf_core_dump.h -+++ git/src/common/linux/elf_core_dump.h -@@ -33,10 +33,13 @@ +--- a/src/common/linux/elf_core_dump.h ++++ b/src/common/linux/elf_core_dump.h +@@ -33,10 +33,14 @@ #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ #define COMMON_LINUX_ELF_CORE_DUMP_H_ +#include <config.h> #include <elf.h> + #include <limits.h> #include <link.h> #include <stddef.h> -- +#ifdef HAVE_SYS_REG_H +#include <sys/reg.h> +#endif + #include "common/memory_range.h" - namespace google_breakpad { diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch deleted file mode 100644 index 6c097cd22..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ba1b3e35e7c743b670bedc3e90001dfb868df10 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sun, 1 Feb 2015 13:45:51 +0100 -Subject: [PATCH 2/6] Use _fpstate instead of _libc_fpstate on linux - -glibc defines both. musl libc only the former. ---- - src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++-- - src/client/linux/dump_writer_common/ucontext_reader.h | 2 +- - src/client/linux/minidump_writer/minidump_writer.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc -=================================================================== ---- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ git/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstruction - } - - void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fp) { -+ const struct _fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_X86_FULL | -@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstruction - } - - void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fpregs) { -+ const struct _fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_AMD64_FULL; -Index: git/src/client/linux/dump_writer_common/ucontext_reader.h -=================================================================== ---- git.orig/src/client/linux/dump_writer_common/ucontext_reader.h -+++ git/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -50,7 +50,7 @@ struct UContextReader { - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) - static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fp); -+ const struct _fpstate* fp); - #elif defined(__aarch64__) - static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); -Index: git/src/client/linux/minidump_writer/minidump_writer.h -=================================================================== ---- git.orig/src/client/linux/minidump_writer/minidump_writer.h -+++ git/src/client/linux/minidump_writer/minidump_writer.h -@@ -48,7 +48,7 @@ class ExceptionHandler; - #if defined(__aarch64__) - typedef struct fpsimd_context fpstate_t; - #elif !defined(__ARM_EABI__) && !defined(__mips__) --typedef struct _libc_fpstate fpstate_t; -+typedef struct _fpstate fpstate_t; - #endif - - // These entries store a list of memory regions that the client wants included diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch deleted file mode 100644 index cfd9a9b34..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 15582e19c2545d5ffe8ff07f957d0ed602aeca74 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 14 Sep 2017 23:15:09 -0700 -Subject: [PATCH 2/5] <sys/signal.h> is a nonportable alias for <signal.h> - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/linux/handler/exception_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index 05936d28..cca023fd 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -78,7 +78,7 @@ - #include <sys/wait.h> - #include <unistd.h> - --#include <sys/signal.h> -+#include <signal.h> - #include <sys/ucontext.h> - #include <sys/user.h> - #include <ucontext.h> --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch index 2593ea93e..76b2088b0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch @@ -10,10 +10,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/common/stabs_reader_unittest.cc | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) -Index: git/src/common/stabs_reader.cc -=================================================================== ---- git.orig/src/common/stabs_reader.cc -+++ git/src/common/stabs_reader.cc +--- a/src/common/stabs_reader.cc ++++ b/src/common/stabs_reader.cc @@ -34,7 +34,9 @@ #include "common/stabs_reader.h" @@ -24,10 +22,8 @@ Index: git/src/common/stabs_reader.cc #include <string.h> #include <string> -Index: git/src/common/stabs_reader.h -=================================================================== ---- git.orig/src/common/stabs_reader.h -+++ git/src/common/stabs_reader.h +--- a/src/common/stabs_reader.h ++++ b/src/common/stabs_reader.h @@ -58,6 +58,30 @@ #elif defined(HAVE_A_OUT_H) #include <a.out.h> @@ -59,10 +55,8 @@ Index: git/src/common/stabs_reader.h #include <string> #include <vector> -Index: git/src/common/stabs_reader_unittest.cc -=================================================================== ---- git.orig/src/common/stabs_reader_unittest.cc -+++ git/src/common/stabs_reader_unittest.cc +--- a/src/common/stabs_reader_unittest.cc ++++ b/src/common/stabs_reader_unittest.cc @@ -33,7 +33,9 @@ #include <assert.h> @@ -73,16 +67,14 @@ Index: git/src/common/stabs_reader_unittest.cc #include <stdarg.h> #include <stdlib.h> #include <string.h> -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, AC_HEADER_STDC AC_SYS_LARGEFILE AX_PTHREAD --AC_CHECK_HEADERS([a.out.h sys/random.h]) -+AC_CHECK_HEADERS([a.out.h stab.h sys/random.h]) - AC_CHECK_FUNCS([arc4random getrandom]) - - AX_CXX_COMPILE_STDCXX(11, noext, mandatory) +-AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h]) ++AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h]) + AC_CHECK_FUNCS([arc4random getcontext getrandom memfd_create]) + AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes]) + AM_CONDITIONAL([HAVE_MEMFD_CREATE], [test "x$ac_cv_func_memfd_create" = xyes]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch index 525a1555b..5892cfa7d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch @@ -9,35 +9,33 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/common/dwarf/elf_reader.cc | 1 + 1 file changed, 1 insertion(+) -Index: git/src/common/dwarf/elf_reader.cc -=================================================================== ---- git.orig/src/common/dwarf/elf_reader.cc -+++ git/src/common/dwarf/elf_reader.cc -@@ -29,10 +29,13 @@ - #ifndef _GNU_SOURCE +--- a/src/common/dwarf/elf_reader.cc ++++ b/src/common/dwarf/elf_reader.cc +@@ -30,12 +30,16 @@ #define _GNU_SOURCE // needed for pread() #endif -- + +#include <config.h> - #include <sys/types.h> - #include <sys/stat.h> + #include <fcntl.h> + #include <limits.h> + #include <string.h> #include <sys/mman.h> + #include <sys/stat.h> + #include <sys/types.h> +#ifdef HAVE_SYS_REG_H +#include <sys/reg.h> +#endif #include <unistd.h> - #include <fcntl.h> - #include <string.h> -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac + + #include <algorithm> +--- a/configure.ac ++++ b/configure.ac @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, AC_HEADER_STDC AC_SYS_LARGEFILE AX_PTHREAD --AC_CHECK_HEADERS([a.out.h stab.h sys/random.h]) -+AC_CHECK_HEADERS([a.out.h stab.h sys/random.h sys/reg.h]) - AC_CHECK_FUNCS([arc4random getrandom]) - - AX_CXX_COMPILE_STDCXX(11, noext, mandatory) +-AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h]) ++AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h sys/reg.h]) + AC_CHECK_FUNCS([arc4random getcontext getrandom memfd_create]) + AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes]) + AM_CONDITIONAL([HAVE_MEMFD_CREATE], [test "x$ac_cv_func_memfd_create" = xyes]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch index 19bb56044..96f5f48cc 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch @@ -1,12 +1,9 @@ -Index: lss/linux_syscall_support.h -=================================================================== ---- lss.orig/linux_syscall_support.h -+++ lss/linux_syscall_support.h -@@ -118,21 +118,13 @@ extern "C" { - #include <endian.h> +--- a/linux_syscall_support.h ++++ b/linux_syscall_support.h +@@ -119,14 +119,7 @@ extern "C" { #ifdef __mips__ --/* Include definitions of the ABI currently in use. */ + /* Include definitions of the ABI currently in use. */ -#ifdef __ANDROID__ -/* Android doesn't have sgidefs.h, but does have asm/sgidefs.h, - * which has the definitions we need. @@ -18,10 +15,3 @@ Index: lss/linux_syscall_support.h #endif #endif - /* The Android NDK's <sys/stat.h> #defines these macros as aliases - * to their non-64 counterparts. To avoid naming conflict, remove them. */ --#ifdef __ANDROID__ -+#if defined(__ANDROID__) || (defined(__linux__) && !defined(__glibc__)) - /* These are restored by the corresponding #pragma pop_macro near - * the end of this file. */ - # pragma push_macro("stat64") diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index daf262ed6..81955f450 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -6,11 +6,13 @@ SUMMARY = "An open-source multi-platform crash reporting system" DESCRIPTION = "Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \"minidump\" files, send them back to your server, and produce C and C++ stack traces from these minidumps. " HOMEPAGE = "https://code.google.com/p/google-breakpad/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=56c24a43c81c3af6fcf590851931489e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8bb274ebd1901085fd71a8d8afe8831b" SECTION = "libs" inherit autotools +DEPENDS_append_libc-musl = " libucontext" + BBCLASSEXTEND = "native" PE = "2" @@ -19,27 +21,25 @@ PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" -SRCREV_breakpad = "0c0e24f709288a129d665ec27d6f089189318385" +SRCREV_breakpad = "8b22babdf894e5aa98b2dbbe103f7e3856a71944" #v1.10.0 -SRCREV_gtest = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081" +SRCREV_gtest = "4fe018038f87675c083d0cfb6a6b57c274fb1753" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" -SRCREV_lss = "8048ece6c16c91acfe0d36d1d3cc0890ab6e945c" +SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" -SRC_URI = "git://github.com/google/breakpad;name=breakpad \ +SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main \ git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest \ - git://github.com/google/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \ - git://chromium.googlesource.com/linux-syscall-support;protocol=https;destsuffix=git/src/third_party/lss;name=lss \ + git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \ + git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp \ file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ file://0001-Turn-off-sign-compare-for-musl-libc.patch \ - file://0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch \ file://0003-Dont-include-stab.h.patch \ file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ - file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \ file://mcontext.patch \ - file://0001-disable-calls-to-getcontext-with-musl.patch \ + file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \ @@ -47,8 +47,11 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ S = "${WORKDIR}/git" CXXFLAGS += "-D_GNU_SOURCE" +LDFLAGS_append_libc-musl = " -lucontext" COMPATIBLE_HOST_powerpc = "null" +COMPATIBLE_HOST_powerpc64 = "null" +COMPATIBLE_HOST_powerpc64le = "null" COMPATIBLE_HOST_riscv64 = "null" COMPATIBLE_HOST_riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch new file mode 100644 index 000000000..12dd23810 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch @@ -0,0 +1,41 @@ +From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 8 Apr 2021 14:06:05 +0800 +Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share + +Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 8516803..a2d8c00 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,14 +5,16 @@ all: + + clean: + +-DSDIR=$(DESTDIR)/usr/share/debootstrap ++datadir ?= "/usr/share" ++sbindir ?= "/usr/sbin" ++DSDIR=$(DESTDIR)${datadir}/debootstrap + install: + mkdir -p $(DSDIR)/scripts +- mkdir -p $(DESTDIR)/usr/sbin ++ mkdir -p $(DESTDIR)$(sbindir) + + cp -a scripts/* $(DSDIR)/scripts/ + install -o root -g root -m 0644 functions $(DSDIR)/ + +- sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap +- chown root:root $(DESTDIR)/usr/sbin/debootstrap +- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap ++ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap ++ chown root:root $(DESTDIR)$(sbindir)/debootstrap ++ chmod 0755 $(DESTDIR)$(sbindir)/debootstrap +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch new file mode 100644 index 000000000..69329df4e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch @@ -0,0 +1,47 @@ +From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 8 Apr 2021 14:08:06 +0800 +Subject: [PATCH 2/2] support to override /usr/bin/arch-test + +Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + debootstrap | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/debootstrap b/debootstrap +index 9b9e58d..a3cf3af 100755 +--- a/debootstrap ++++ b/debootstrap +@@ -51,6 +51,10 @@ INRELEASE_PATH="" + DEF_MIRROR="http://deb.debian.org/debian" + DEF_HTTPS_MIRROR="https://deb.debian.org/debian" + ++if [ -z "$ARCH_TEST" ]; then ++ ARCH_TEST="/usr/bin/arch-test" ++fi ++ + # set $CONTAINER + detect_container + +@@ -645,12 +649,12 @@ fi + + ########################################################################### + +-if [ -x /usr/bin/arch-test ] && am_doing_phase second_stage; then ++if [ -x ${ARCH_TEST} ] && am_doing_phase second_stage; then + if doing_variant fakechroot; then +- ret=0; arch-test "$ARCH" || ret=$? ++ ret=0; ${ARCH_TEST} "$ARCH" || ret=$? + # Avoid failure with old arch-test package +- elif arch-test --version > /dev/null 2>&1; then +- ret=0; arch-test -c "$TARGET" "$ARCH" || ret=$? ++ elif ${ARCH_TEST} --version > /dev/null 2>&1; then ++ ret=0; ${ARCH_TEST} -c "$TARGET" "$ARCH" || ret=$? + else + ret=3 + fi +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz Binary files differdeleted file mode 100644 index 20eaba3ad..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz +++ /dev/null diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.123.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.123.bb new file mode 100644 index 000000000..bb4345687 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.123.bb @@ -0,0 +1,23 @@ +SUMMARY = "Install a Debian system into a subdirectory" +HOMEPAGE = "https://wiki.debian.org/Debootstrap" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" + +SRC_URI = "\ + http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${PV}.tar.gz \ + file://0001-support-to-override-usr-sbin-and-usr-share.patch \ + file://0002-support-to-override-usr-bin-arch-test.patch \ +" + +SRC_URI[md5sum] = "b959c7ac01839e9b96a733d27b19e59e" +SRC_URI[sha256sum] = "5e5a8147ecdd6be0eea5ac4d6ed8192cc653e93f744dd3306c9b1cc51d6ca328" + +S = "${WORKDIR}/debootstrap" + +fakeroot do_install() { + oe_runmake 'DESTDIR=${D}' install + chown -R root:root ${D}${datadir}/debootstrap +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb deleted file mode 100644 index 8472aca6c..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Install a Debian system into a subdirectory" -HOMEPAGE = "https://wiki.debian.org/Debootstrap" -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" - -inherit pkgconfig - -SRC_URI = "\ - http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz \ - file://devices.tar.gz;unpack=0 \ -" - -SRC_URI[md5sum] = "eacabfe2e45415af60b1d74c3a23418a" -SRC_URI[sha256sum] = "0a12e0a2bbff185d47711a716b1f2734856100e8784361203e834fed0cffa51b" - -S = "${WORKDIR}/${BP}" - -# All Makefile does is creation of devices.tar.gz, which fails in OE build, we use -# static devices.tar.gz as work around -# | NOTE: make -j 8 -e MAKEFLAGS= -# | rm -rf dev -# | mkdir -p dev -# | chown 0:0 dev -# | chown: changing ownership of `dev': Operation not permitted -# | make: *** [devices.tar.gz] Error 1 -# | WARNING: exit code 1 from a shell command. -do_compile_prepend() { - cp ${WORKDIR}/devices.tar.gz ${B} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - chown -R root:root ${D}${datadir}/debootstrap -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch index c86dc1691..6906efd1c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch @@ -8,6 +8,7 @@ native build but all modern systems supply it as part of the standard C library. We don't need this check in meta-openembedded. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Upstream-status: Inappropriate - upstream doxygen must build on many architectures, this change is @@ -17,10 +18,10 @@ Upstream-status: Inappropriate 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2f2c1..22cf0144 100644 +index 06b9696f..f30b46b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -92,10 +92,6 @@ if (sqlite3) +@@ -117,10 +117,6 @@ if (sqlite3) endif() endif() @@ -28,9 +29,9 @@ index 45c2f2c1..22cf0144 100644 -include_directories(${ICONV_INCLUDE_DIR}) - - - #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") + #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) -- -2.17.1 +2.27.0 diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch index 53f88885f..9d1a5a93d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch @@ -1,4 +1,4 @@ -From aa833cf56c5cc2e87a1d91881eb2286beb34e417 Mon Sep 17 00:00:00 2001 +From 7aeee92c752f8a4b2524ed6a41d60c1a3ca8bf2d Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> Date: Wed, 26 Aug 2020 10:52:10 +0300 Subject: [PATCH] doxygen: Fix Python issues for doxygen-native @@ -32,25 +32,28 @@ result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE. This patch is only needded by doxygen-native. +Updated to apply to release 1.9.1. + Upstream-Status: Inappropriate[oe specific] Co-Authored-By: Kai Kang <kai.kang@windriver.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- CMakeLists.txt | 2 +- addon/doxywizard/CMakeLists.txt | 6 +++--- doc/CMakeLists.txt | 6 +++--- examples/CMakeLists.txt | 4 ++-- libmscgen/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 12 ++++++------ + src/CMakeLists.txt | 10 +++++----- testing/CMakeLists.txt | 4 ++-- - 7 files changed, 18 insertions(+), 18 deletions(-) + 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 35e6a0c2..9aaebbdf 100644 +index f30b46b8..50f211c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -100,7 +100,7 @@ else () +@@ -101,7 +101,7 @@ else () endif () find_program(DOT NAMES dot) @@ -60,50 +63,50 @@ index 35e6a0c2..9aaebbdf 100644 find_package(BISON REQUIRED) if (BISON_VERSION VERSION_LESS 2.7) diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index 6aacd8b6..fa197e9e 100644 +index a6f65f8d..d163aa5b 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA # generate version.cpp add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp - DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp + DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp ) @@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER # generate configdoc.cpp add_custom_command( --COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp -+COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp - OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp + DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml + OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) - set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) -@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN - set(LEX_FILES config_doxyw) +@@ -75,7 +75,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN + set(LEX_FILES config_doxyw) foreach(lex_file ${LEX_FILES}) add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l - OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h + DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l + OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index a094c570..8a757c20 100644 +index f2d177ed..22a4d602 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt -@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/ +@@ -163,7 +163,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR # doc/language.doc (see tag Doxyfile:INPUT) add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} -+ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/doc/maintainers.txt ${CMAKE_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} +- COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR} ++ COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR} + DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} OUTPUT language.doc WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc -@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) +@@ -172,7 +172,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) # doc/config.doc (see tag Doxyfile:INPUT) add_custom_command( @@ -112,7 +115,7 @@ index a094c570..8a757c20 100644 DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py OUTPUT config.doc WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ -@@ -192,7 +192,7 @@ add_custom_target(docs_chm +@@ -223,7 +223,7 @@ add_custom_target(docs_chm COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py @@ -122,42 +125,42 @@ index a094c570..8a757c20 100644 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 3f1c79b8..d5866ee1 100644 +index 194b4271..248b8076 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt -@@ -51,7 +51,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) - string(REGEX REPLACE ":.*" "" f ${f_inp}) - add_custom_command( +@@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f} + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f} COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg -- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex -+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex ) -@@ -68,7 +68,7 @@ add_custom_target(examples - if (DOT) - add_custom_command( +@@ -73,7 +73,7 @@ if (DOT) + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg -- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex + COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex ) diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt -index 079fcfc8..e6d86f61 100644 +index 0a239008..09849e2d 100644 --- a/libmscgen/CMakeLists.txt +++ b/libmscgen/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( set(LEX_FILES mscgen_lexer) foreach(lex_file ${LEX_FILES}) add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h + DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l OUTPUT ${GENERATED_SRC}/${lex_file}.l.h ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index cb289116..356741ff 100644 +index 5004a957..68e803f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) @@ -191,21 +194,12 @@ index cb289116..356741ff 100644 # resources.cpp add_custom_command( COMMENT "Generating ${GENERATED_SRC}/resources.cpp" -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py OUTPUT ${GENERATED_SRC}/resources.cpp ) -@@ -102,7 +102,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED - - # layout_default.xml - add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h - DEPENDS ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py - OUTPUT ${GENERATED_SRC}/layout_default.xml.h - ) -@@ -131,7 +131,7 @@ foreach(lex_file ${LEX_FILES}) +@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES}) set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") add_custom_command( @@ -215,15 +209,15 @@ index cb289116..356741ff 100644 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h ) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt -index b354e78f..28d45e11 100644 +index fd6912e9..0af1865b 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,7 +1,7 @@ # run all tests sequentially (keep for backward compatibility) add_custom_target(tests COMMENT "Running doxygen tests..." -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing DEPENDS doxygen ) @@ -231,10 +225,10 @@ index b354e78f..28d45e11 100644 string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}") # add a test target for each test add_test(NAME ${TEST_NAME} -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing +- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ) endforeach() -- -2.17.1 +2.27.0 diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb index d4ac3b720..3370a1313 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb @@ -10,8 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ file://0001-build-don-t-look-for-Iconv.patch \ " SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch" -SRC_URI[md5sum] = "8729936a843232a66fe970ef65f3c3e4" -SRC_URI[sha256sum] = "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec" +SRC_URI[sha256sum] = "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1" inherit cmake python3native diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.4.bb index 358ec80e8..03de4997b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.4.bb @@ -10,8 +10,13 @@ DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl DEPENDS_append_class-target = " googletest grpc-native " DEPENDS_append_class-nativesdk = " grpc-native " +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" + S = "${WORKDIR}/git" -SRCREV_grpc = "3b7f86e3516746c5f0db1947e0d65e94159bcb12" +SRCREV_grpc = "3e53dbe8213137d2c731ecd4d88ebd2948941d75" BRANCH = "v1.36.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ " @@ -72,4 +77,4 @@ BBCLASSEXTEND = "native nativesdk" SYSROOT_DIRS_BLACKLIST_append_class-target = " ${baselib}/cmake/grpc" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-compiler += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index 88fad936b..6277c41b4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb @@ -1,4 +1,4 @@ -SUMMARY = "runtime performance analyzer" +SUMMARY = "performance analyzer" HOMEPAGE = "https://github.com/iipeace/guider" BUGTRACKER = "https://github.com/iipeace/guider/issues" AUTHOR = "Peace Lee <ipeace5@gmail.com>" @@ -6,10 +6,10 @@ AUTHOR = "Peace Lee <ipeace5@gmail.com>" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -PV = "3.9.7+git${SRCPV}" +PV = "3.9.8+git${SRCPV}" SRC_URI = "git://github.com/iipeace/${BPN}" -SRCREV = "459b5189a46023fc98e19888b196bdc2674022fd" +SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb index e41907de4..a02ff4a4d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb @@ -13,13 +13,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" PE = "1" -SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2" +SRCREV = "9059f5cad030ba11d37818847443a53918c327b1" SRC_URI = "git://github.com/open-source-parsers/jsoncpp" S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.3.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb index 576eff6d5..832254a00 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb @@ -18,5 +18,5 @@ do_configure_prepend() { done } -SRC_URI[archive.md5sum] = "e574b3952b93d219b5ec7c74c5892c33" -SRC_URI[archive.sha256sum] = "d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de" +SRC_URI[archive.md5sum] = "4d7d6f1f8054f1b3466c752ac2e50946" +SRC_URI[archive.sha256sum] = "524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch new file mode 100644 index 000000000..dff61b150 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch @@ -0,0 +1,39 @@ +--- a/sysdeps/linux-gnu/ppc/ptrace.h ++++ b/sysdeps/linux-gnu/ppc/ptrace.h +@@ -18,4 +18,5 @@ + * 02110-1301 USA + */ + ++#include <asm/ptrace.h> + #include <sys/ptrace.h> +--- a/sysdeps/linux-gnu/ppc/regs.c ++++ b/sysdeps/linux-gnu/ppc/regs.c +@@ -23,11 +23,14 @@ + + #include "config.h" + ++#include <string.h> + #include <sys/types.h> + #include <sys/ptrace.h> + #include <asm/ptrace.h> + #include <errno.h> ++#ifdef HAVE_ERROR_H + #include <error.h> ++#endif + + #include "proc.h" + #include "common.h" +@@ -49,8 +52,11 @@ get_instruction_pointer(struct process * + void + set_instruction_pointer(struct process *proc, void *addr) + { +- if (ptrace(PTRACE_POKEUSER, proc->pid, sizeof(long)*PT_NIP, addr) != 0) +- error(0, errno, "set_instruction_pointer"); ++ if (ptrace(PTRACE_POKEUSER, proc->pid, sizeof(long)*PT_NIP, addr) != 0){ ++ report_global_error("%s: set_instruction_pointer", ++ strerror(errno)); ++ exit(1); ++ } + } + + void * diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 5710943d7..17264cef5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -30,6 +30,8 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-Bug-fix-for-data-type-length-judgment.patch \ file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ " +SRC_URI_append_libc-musl = " file://add_ppc64le.patch" + S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-nsswitch.y-Replace-empty-bison-extension.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-nsswitch.y-Replace-empty-bison-extension.patch new file mode 100644 index 000000000..67c8b1bcf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-nsswitch.y-Replace-empty-bison-extension.patch @@ -0,0 +1,50 @@ +From 82e51fb8ba2640b318826ef4e17b0f5c09c8dded Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 20:10:18 -0800 +Subject: [PATCH] nsswitch.y: Replace %empty bison extension + +POSIX compliant yacc do not understand %empty therefore replace it with +/* empty */ + +https://github.com/pikhq/musl-nscd/issues/13 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nsswitch.y | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/nsswitch.y b/src/nsswitch.y +index 107073b..0b7c71e 100644 +--- a/src/nsswitch.y ++++ b/src/nsswitch.y +@@ -38,7 +38,7 @@ top: + ; + + file: +- %empty { ++ /* empty */ { + list_init(&$$); + } + | file line { +@@ -88,7 +88,7 @@ modifier: + ; + + modifiers: +- %empty { ++ /* empty */ { + memcpy($$, default_actions, sizeof($$)); + } + | modifiers modifier { +@@ -112,7 +112,7 @@ item: + ; + + list: +- %empty { ++ /* empty */ { + list_init(&$$); + } + | list item { +-- +2.30.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index 83125a1ba..6af7ab9cd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -15,6 +15,7 @@ SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" SRC_URI = "git://github.com/pikhq/musl-nscd \ file://0001-Fix-build-under-GCC-fno-common.patch \ file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ + file://0001-nsswitch.y-Replace-empty-bison-extension.patch \ " UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.21.0.bb index 6acc36b4f..9b86bf337 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.21.0.bb @@ -26,7 +26,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "961ad600f0706c396390ebc7767fb01d5e3792a5022dc2e7774796756eec6d3c" +SRC_URI[sha256sum] = "052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d" S = "${WORKDIR}/node-v${PV}" @@ -39,7 +39,7 @@ def map_nodejs_arch(a, d): if re.match('i.86$', a): return 'ia32' elif re.match('x86_64$', a): return 'x64' elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' + elif re.match('(powerpc64|powerpc64le|ppc64le)$', a): return 'ppc64' elif re.match('powerpc$', a): return 'ppc' return a diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 05e06a25d..85add50b6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -12,12 +12,12 @@ SRC_URI = " \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3" +SRCREV_openocd = "f342aac0845a69d591ad39a025d74e9c765f6420" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "0aa0fb4e3a38d38a49de9eb585d93d63a370dcf6" SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" -PV = "0.10+gitr${SRCPV}" +PV = "0.11+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb index f8a8755b9..e19d5dd21 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -214,6 +214,8 @@ RDEPENDS_${PN}-cli = "${PN}" RDEPENDS_${PN}-modphp = "${PN} apache2" RDEPENDS_${PN}-opcache = "${PN}" +ALLOW_EMPTY_${PN} = "1" + INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d diff --git a/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb index 7d693b36d..b1327efeb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ply/ply_git.bb @@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "bison-native" +PV = "2.1.1+git${SRCPV}" + SRC_URI = "git://github.com/iovisor/ply" -SRCREV = "aa5b9ac31307ec1acece818be334ef801c802a12" +SRCREV = "e25c9134b856cc7ffe9f562ff95caf9487d16b59" S = "${WORKDIR}/git" inherit autotools-brokensep -COMPATIBLE_HOST = "(x86_64.*|aarch64.*|arm.*|powerpc.*)-linux" +COMPATIBLE_HOST = "(x86_64.*|aarch64.*|arm.*|powerpc)-linux" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch b/meta-openembedded/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch new file mode 100644 index 000000000..58c9aec08 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch @@ -0,0 +1,50 @@ +From 9d47d2fd45c455339759dbfe9a0d6fd24b0a0fa1 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Mar 2021 15:39:36 +0800 +Subject: [PATCH] tclap: add pkg-config file + +The tclap switched from autotools to CMake in 1.4.0 and drop the +pkg-config file tclap.pc. Some projects (e.g. ima-inspect) still require +it. So add it back. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 5 +++++ + tclap.pc.in | 7 +++++++ + 2 files changed, 12 insertions(+) + create mode 100644 tclap.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2c9a26..b56eac7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,11 @@ install(FILES "${PROJECT_BINARY_DIR}/tclap/TCLAPConfig.h" + DESTINATION include/tclap + ) + ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tclap.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ + add_subdirectory(docs) + add_subdirectory(examples) + add_subdirectory(tests) +diff --git a/tclap.pc.in b/tclap.pc.in +new file mode 100644 +index 0000000..ef51c94 +--- /dev/null ++++ b/tclap.pc.in +@@ -0,0 +1,7 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++Name: tclap ++Description: Templatized C++ Command Line Parser ++Version: @PROJECT_VERSION@ ++Cflags: -I${includedir} +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch deleted file mode 100644 index 358cbefdd..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c209ed0e7ffca32fe3714bad9cc54bdb00c286bb Mon Sep 17 00:00:00 2001 -From: Ting Liu <b28495@freescale.com> -Date: Mon, 15 Apr 2013 16:28:37 +0800 -Subject: [PATCH] Makefile.am: disable docs - -Upstream-Status: Inappropriate [OE specific] - -docs need some generating tool (for example, doxygen) from host which may -be not available. Disable it to avoid build issue. - -Signed-off-by: Ting Liu <b28495@freescale.com> ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0a6ebc9..6b42f41 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - - ACLOCAL_AMFLAGS = -I config - --SUBDIRS = include examples docs tests msc config -+SUBDIRS = include examples tests msc config - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(PACKAGE).pc --- -1.7.5 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb deleted file mode 100644 index bba8d5c21..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Templatized C++ Command Line Parser" -HOMEPAGE = "http://tclap.sourceforge.net/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0ca8b9c5c5445cfa7af7e78fd27e60ed" - -SRCREV = "ec3ddcfe41b0544a4551a57439b6b3682fe31479" -SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.2 \ - file://Makefile.am-disable-docs.patch \ -" - -S = "${WORKDIR}/git" -inherit autotools - -ALLOW_EMPTY_${PN} = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb new file mode 100644 index 000000000..7c8224b57 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Templatized C++ Command Line Parser" +HOMEPAGE = "http://tclap.sourceforge.net/" +DESCRIPTION = "TCLAP is a small, flexible library that provides a simple interface \ +for defining and accessing command line arguments. It was intially inspired by the \ +user friendly CLAP libary. The difference is that this library is templatized, so \ +the argument class is type independent. Type independence avoids identical-except-for-type \ +objects, such as IntArg, FloatArg, and StringArg. While the library is not strictly \ +compliant with the GNU or POSIX standards, it is close. \ +" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5c64b2e8cc50917b2744a90950faa7cd" + +SRCREV = "799a8b1f99818e39fee19d0601030770af1221e1" +SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4 \ + file://0001-tclap-add-pkg-config-file.patch \ +" + +S = "${WORKDIR}/git" +inherit cmake + +ALLOW_EMPTY_${PN} = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch new file mode 100644 index 000000000..ac17cf433 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch @@ -0,0 +1,27 @@ +From 0bc502989822506af308a559ac1cd52af82cac03 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 14 Apr 2021 09:35:35 +0900 +Subject: [PATCH] Fix error on aarch64 with binutils2.35.1. + +WARN: child terminated by signal: 11: Segmentation fault + +Upstream-status: Pending + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + arch/aarch64/mcount-arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/aarch64/mcount-arch.h b/arch/aarch64/mcount-arch.h +index 69efe521..60c2c1ba 100644 +--- a/arch/aarch64/mcount-arch.h ++++ b/arch/aarch64/mcount-arch.h +@@ -31,7 +31,7 @@ struct mcount_arch_context { + double d[ARCH_MAX_FLOAT_REGS]; + }; + +-#define ARCH_PLT0_SIZE 32 ++#define ARCH_PLT0_SIZE 16 + #define ARCH_PLTHOOK_ADDR_OFFSET 0 + + struct mcount_disasm_engine; diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb index a3d060218..4b4fc831c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb @@ -13,6 +13,7 @@ inherit autotools PV .= "+git${SRCPV}" SRCREV = "d648bbffedef529220896283fb59e35531c13804" SRC_URI = "git://github.com/namhyung/${BPN} \ + file://0001-Fix-error-on-aarch64-with-binutils2.35.1.patch \ " S = "${WORKDIR}/git" |