From owner-svn-ports-branches@freebsd.org Tue Sep 5 05:54:35 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0924E1BBFA; Tue, 5 Sep 2017 05:54:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F0A977136; Tue, 5 Sep 2017 05:54:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v855sYJO087760; Tue, 5 Sep 2017 05:54:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v855sY8a087759; Tue, 5 Sep 2017 05:54:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201709050554.v855sY8a087759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 5 Sep 2017 05:54:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449271 - branches/2017Q3/graphics/colmap/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q3/graphics/colmap/files X-SVN-Commit-Revision: 449271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Sep 2017 05:54:35 -0000 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