diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-09-05 13:54:34 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-09-05 13:54:34 +0800 |
| commit | a5c2ba137593610c8c5bc82a0805ec9ada137f5e (patch) | |
| tree | 37ff06e793839f7fd76f3f54737f3260e8d597b6 | |
| parent | c67a16e33d72935b8cbb9c3d8b3f30e9106fcf94 (diff) | |
| download | freebsd-ports-a5c2ba137593610c8c5bc82a0805ec9ada137f5e.tar.gz freebsd-ports-a5c2ba137593610c8c5bc82a0805ec9ada137f5e.tar.zst freebsd-ports-a5c2ba137593610c8c5bc82a0805ec9ada137f5e.zip | |
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
| -rw-r--r-- | graphics/colmap/files/patch-src_ext_VLFeat_host.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/graphics/colmap/files/patch-src_ext_VLFeat_host.c b/graphics/colmap/files/patch-src_ext_VLFeat_host.c new file mode 100644 index 000000000000..4d5386268a11 --- /dev/null +++ b/graphics/colmap/files/patch-src_ext_VLFeat_host.c @@ -0,0 +1,20 @@ +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 |