cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use the use_allocator_shim build flag instead of a patch

Browse Source
This commit is contained in:
robert 2021-11-08 10:40:16 +00:00
parent 8c4a3bb959
commit 1c0744529d
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/chromium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.595 2021/11/07 15:29:20 kn Exp $
# $OpenBSD: Makefile,v 1.596 2021/11/08 10:40:16 robert Exp $
BROKEN-powerpc64 = Check failed: false. OS architecture not handled. (powerpc64)
@ -145,6 +145,7 @@ GN_ARGS= enable_nacl=false \
treat_warnings_as_errors=false \
clang_use_chrome_plugins=false \
use_allocator=\"none\" \
use_allocator_shim=false \
disable_fieldtrial_testing_config=true \
extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \
fatal_linker_warnings=false

14
www/chromium/patches/patch-base_allocator_allocator_gni
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-base_allocator_allocator_gni,v 1.11 2021/09/01 16:54:37 robert Exp $
Index: base/allocator/allocator.gni
--- base/allocator/allocator.gni.orig
+++ base/allocator/allocator.gni
@@ -6,7 +6,7 @@ import("//build/config/chromecast_build.gni")
import("//build/config/sanitizers/sanitizers.gni")
# Sanitizers replace the allocator, don't use our own.
-_is_using_sanitizers = is_asan || is_hwasan || is_lsan || is_tsan || is_msan
+_is_using_sanitizers = is_asan || is_hwasan || is_lsan || is_tsan || is_msan || is_openbsd
# - Component build support is disabled on all platforms. It is known to cause
# issues on some (e.g. Windows with shims, Android with non-universal symbol

11
www/chromium/patches/patch-build_config_BUILD_gn
View File

@ -1,17 +1,8 @@
$OpenBSD: patch-build_config_BUILD_gn,v 1.27 2021/09/01 16:54:38 robert Exp $
$OpenBSD: patch-build_config_BUILD_gn,v 1.28 2021/11/08 10:40:16 robert Exp $
Index: build/config/BUILD.gn
--- build/config/BUILD.gn.orig
+++ build/config/BUILD.gn
@@ -78,7 +78,7 @@ config("feature_flags") {
if (use_x11) {
defines += [ "USE_X11=1" ]
}
- if (is_asan || is_hwasan || is_lsan || is_tsan || is_msan) {
+ if (is_asan || is_hwasan || is_lsan || is_tsan || is_msan || is_openbsd) {
defines += [ "MEMORY_TOOL_REPLACES_ALLOCATOR" ]
}
if (is_asan) {
@@ -225,7 +225,7 @@ config("default_libs") {
"CoreText.framework",
"Foundation.framework",