Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 18 Apr 2018 07:21:05 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467685 - in head/www/chromium: . files
Message-ID:  <201804180721.w3I7L55v079921@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: cpm
Date: Wed Apr 18 07:21:05 2018
New Revision: 467685
URL: https://svnweb.freebsd.org/changeset/ports/467685

Log:
  www/chromium: Unbreak build on 12/aarch64
  
  ../../third_party/skia/src/core/SkCpu.cpp:84:27: error: use of undeclared identifier 'getauxval'
          uint32_t hwcaps = getauxval(AT_HWCAP);
                            ^
  
  PR:		224383
  Submitted by:	Mikael Urankar <mikael.urankar@gmail.com>
  Reported by:	jbeich

Added:
  head/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp   (contents, props changed)
  head/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h   (contents, props changed)
Modified:
  head/www/chromium/Makefile

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Wed Apr 18 07:15:22 2018	(r467684)
+++ head/www/chromium/Makefile	Wed Apr 18 07:21:05 2018	(r467685)
@@ -65,7 +65,6 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-lite>0:x11-fonts/noto-lite
 
 BROKEN_FreeBSD_11_aarch64=	components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous
-BROKEN_FreeBSD_12_aarch64=	third_party/skia/src/core/SkCpu.cpp:84:27: use of undeclared identifier 'getauxval'
 ONLY_FOR_ARCHS=			aarch64 amd64 i386
 
 .endif

Added: head/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp	Wed Apr 18 07:21:05 2018	(r467685)
@@ -0,0 +1,18 @@
+--- third_party/skia/src/core/SkCpu.cpp	2018-04-13 18:15:13 UTC
++++ third_party/skia/src/core/SkCpu.cpp
+@@ -78,12 +78,15 @@
+     #include <sys/auxv.h>
+ 
+     static uint32_t read_cpu_features() {
++return 0;
++#if 0
+         const uint32_t kHWCAP_CRC32 = (1<<7);
+ 
+         uint32_t features = 0;
+         uint32_t hwcaps = getauxval(AT_HWCAP);
+         if (hwcaps & kHWCAP_CRC32) { features |= SkCpu::CRC32; }
+         return features;
++#endif
+     }
+ 
+ #elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \

Added: head/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h	Wed Apr 18 07:21:05 2018	(r467685)
@@ -0,0 +1,19 @@
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h	2018-04-13 18:15:04 UTC
++++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
+@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type)
+ namespace crc32c {
+ 
+ inline bool CanUseArm64Linux() {
++return false;
++#if 0
+ #if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
+   // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
+   constexpr unsigned long kHWCAP_PMULL = 1 << 4;
+@@ -39,6 +41,7 @@ inline bool CanUseArm64Linux() {
+ #else
+   return false;
+ #endif  // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
++#endif
+ }
+ 
+ }  // namespace crc32c

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804180721.w3I7L55v079921>