Date: Tue, 27 Nov 2018 06:49:26 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485985 - in head/www/chromium: . files Message-ID: <201811270649.wAR6nQmt026926@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Tue Nov 27 06:49:25 2018 New Revision: 485985 URL: https://svnweb.freebsd.org/changeset/ports/485985 Log: Revert r485933 It was based on an older version of the port, revert until I work on it again Approved by: bapt (mentor, implicit) Deleted: head/www/chromium/files/patch-third__party_zlib_arm__features.c Modified: head/www/chromium/Makefile head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c head/www/chromium/files/patch-third__party_zlib_BUILD.gn head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/Makefile Tue Nov 27 06:49:25 2018 (r485985) @@ -204,14 +204,6 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${ .include <bsd.port.options.mk> -# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only -.if ${ARCH} == aarch64 -PLIST_SUB+= NOT_AARCH64="@comment " -.else -PLIST_SUB+= NOT_AARCH64="" -.endif - - BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base @@ -305,13 +297,11 @@ do-install: .endfor # SwiftShader -.if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor -.endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ Modified: head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c ============================================================================== --- head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Tue Nov 27 06:49:25 2018 (r485985) @@ -1,11 +1,40 @@ ---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-09-11 22:58:51 UTC -+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c -@@ -60,3 +60,8 @@ void OPENSSL_cpuid_setup(void) { - } +--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2017-09-11 03:00:27.842983000 +0200 ++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2017-09-11 03:02:56.830632000 +0200 +@@ -16,7 +16,9 @@ - #endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP -+ -+#ifdef __FreeBSD__ -+void OPENSSL_cpuid_setup(void) { -+} + #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP) + ++#if defined(OPENSSL_LINUX) + #include <sys/auxv.h> +#endif + + #include <openssl/arm_arch.h> + +@@ -26,6 +28,7 @@ + extern uint32_t OPENSSL_armcap_P; + + void OPENSSL_cpuid_setup(void) { ++#if defined(OPENSSL_LINUX) + unsigned long hwcap = getauxval(AT_HWCAP); + + /* See /usr/include/asm/hwcap.h on an aarch64 installation for the source of +@@ -41,9 +44,11 @@ + * either. */ + return; + } ++#endif + + OPENSSL_armcap_P |= ARMV7_NEON; + ++#if defined(OPENSSL_LINUX) + if (hwcap & kAES) { + OPENSSL_armcap_P |= ARMV8_AES; + } +@@ -56,6 +61,7 @@ + if (hwcap & kSHA256) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } ++#endif + } + + #endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */ Modified: head/www/chromium/files/patch-third__party_zlib_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-third__party_zlib_BUILD.gn Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/files/patch-third__party_zlib_BUILD.gn Tue Nov 27 06:49:25 2018 (r485985) @@ -1,14 +1,5 @@ ---- third_party/zlib/BUILD.gn.orig 2018-08-08 21:11:58.000000000 +0200 -+++ third_party/zlib/BUILD.gn 2018-09-12 01:00:34.445630000 +0200 -@@ -68,7 +68,7 @@ - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] - } else if (is_linux || is_chromeos) { -- defines += [ "ARMV8_OS_LINUX" ] -+# defines += [ "ARMV8_OS_LINUX" ] - } - } - } +--- third_party/zlib/BUILD.gn.orig 2018-06-13 00:11:08.000000000 +0200 ++++ third_party/zlib/BUILD.gn 2018-07-19 21:36:13.071700000 +0200 @@ -327,7 +327,7 @@ ] } Modified: head/www/chromium/pkg-plist ============================================================================== --- head/www/chromium/pkg-plist Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/pkg-plist Tue Nov 27 06:49:25 2018 (r485985) @@ -313,8 +313,8 @@ bin/chrome %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js %%DATADIR%%/snapshot_blob.bin -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so +%%DATADIR%%/swiftshader/libEGL.so +%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin %%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811270649.wAR6nQmt026926>