Commit 698499d2 authored by Jan Beich's avatar Jan Beich
Browse files

MFH: r449270

graphics/colmap: try#2 to unbreak on non-x86

../ext/VLFeat/libvlfeat.a(host.c.o): In function `_vl_x86cpu_info_init':
host.c:(.text+0x1c): undefined reference to `_vl_cpuid'
host.c:(.text+0x40): undefined reference to `_vl_cpuid'
collect2: error: ld returned 1 exit status

Reported by:	pkg-fallout (aarch64, armv6)
Approved by:	ports-secteam blanket
parent 711bc167
vlfeat: don't try to use CPUID on non-x86
--- src/ext/VLFeat/host.c.orig 2017-06-15 14:32:01 UTC
+++ src/ext/VLFeat/host.c
@@ -441,6 +441,7 @@ _vl_cpuid (vl_int32* info, int function)
#endif
+#if defined(VL_ARCH_IX86) || defined(VL_ARCH_X64) || defined(VL_ARCH_IA64)
void
_vl_x86cpu_info_init (VlX86CpuInfo *self)
{
@@ -487,6 +488,7 @@ _vl_x86cpu_info_to_string_copy (VlX86CpuInfo const *se
}
return string ;
}
+#endif
/** ------------------------------------------------------------------
** @brief Human readable static library configuration
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment