From 57b3dc4375f27e5d3e822d450d08e70bbb1b56e6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Nov 2017 15:40:19 +0100 Subject: [PATCH] google-breakpad: take into account host architecture dependencies Building the target google-breakpad requires building the host variant of google-breakpad. Just like the target google-breakpad only supports a limited number of architectures, it is the same for the host google-breakpad. We therefore introduce a BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS option that is used where necessary to prevent the user from choosing Google Breakpad when building on unsupported host platforms. Fixes: http://autobuild.buildroot.net/results/c7c04483508f9e4d629efa54571afeb1feaa5f73/ (build on a powerpc64le machine) Signed-off-by: Thomas Petazzoni (cherry picked from commit fadc438393841eced94aa6decfd04c5bf448b255) Signed-off-by: Peter Korsgaard --- Config.in | 1 + package/Config.in.host | 1 + package/google-breakpad/Config.in | 2 ++ package/google-breakpad/Config.in.host | 8 ++++++++ 4 files changed, 12 insertions(+) create mode 100644 package/google-breakpad/Config.in.host diff --git a/Config.in b/Config.in index 0b5a6bf726..e995399f49 100644 --- a/Config.in +++ b/Config.in @@ -539,6 +539,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS help This option will enable the use of google breakpad, a library and tool suite that allows you to distribute an application to diff --git a/package/Config.in.host b/package/Config.in.host index 973b682ecd..11db8f263c 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -18,6 +18,7 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/go/Config.in.host" source "package/go-bootstrap/Config.in.host" + source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index e0e91068be..91ec9ce309 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT help Google-Breakpad is a library and tool suite that allows you @@ -36,6 +37,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ diff --git a/package/google-breakpad/Config.in.host b/package/google-breakpad/Config.in.host new file mode 100644 index 0000000000..28d304766a --- /dev/null +++ b/package/google-breakpad/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "arm" + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "mips" + default y if BR2_HOSTARCH = "mipsel" -- 2.39.2