From bd44432240278c5453bb34e723e4274b4638d317 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 21 May 2020 12:05:03 +0100 Subject: [PATCH] trivial: Fix a build failure on aarch64 It seems cpuid.h isn't available everywhere, which make sense in retrospect. --- libfwupdplugin/fu-common.c | 4 ++++ meson.build | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libfwupdplugin/fu-common.c b/libfwupdplugin/fu-common.c index 5eb9c279d..071a7e5a1 100644 --- a/libfwupdplugin/fu-common.c +++ b/libfwupdplugin/fu-common.c @@ -19,7 +19,9 @@ #include #endif +#ifdef HAVE_CPUID_H #include +#endif #include #include @@ -2047,6 +2049,7 @@ fu_common_kernel_locked_down (void) gboolean fu_common_is_cpu_intel (void) { +#ifdef HAVE_CPUID_H guint eax = 0; guint ebx = 0; guint ecx = 0; @@ -2060,5 +2063,6 @@ fu_common_is_cpu_intel (void) ecx == signature_INTEL_ecx) { return TRUE; } +#endif return FALSE; } diff --git a/meson.build b/meson.build index 766bf8776..3e3afa773 100644 --- a/meson.build +++ b/meson.build @@ -258,6 +258,9 @@ endif if cc.has_header('fnmatch.h') conf.set('HAVE_FNMATCH_H', '1') endif +if cc.has_header('cpuid.h') + conf.set('HAVE_CPUID_H', '1') +endif if cc.has_function('getuid') conf.set('HAVE_GETUID', '1') endif