Date: Tue, 5 Sep 2017 05:54:34 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449271 - branches/2017Q3/graphics/colmap/files Message-ID: <201709050554.v855sY8a087759@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Sep 5 05:54:34 2017 New Revision: 449271 URL: https://svnweb.freebsd.org/changeset/ports/449271 Log: 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 Added: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c - copied unchanged from r449270, head/graphics/colmap/files/patch-src_ext_VLFeat_host.c Modified: Directory Properties: branches/2017Q3/ (props changed) Copied: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c (from r449270, head/graphics/colmap/files/patch-src_ext_VLFeat_host.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c Tue Sep 5 05:54:34 2017 (r449271, copy of r449270, head/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709050554.v855sY8a087759>