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

the chromium build systems do not honor USE_NOEXECONLY properly so let's set

Browse Source 
it directly for now
This commit is contained in:
robert 2023-01-27 15:26:51 +00:00
parent 3de70aa009
commit 78d8cdf966
6 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/chromium/Makefile
View File

@ -8,6 +8,7 @@ DPB_PROPERTIES= parallel parallel2
COMMENT= Chromium browser
V= 109.0.5414.119
REVISION= 0
DISTNAME= chromium-${V}

25
www/chromium/patches/patch-build_config_compiler_BUILD_gn
View File

@ -19,18 +19,19 @@ Index: build/config/compiler/BUILD.gn
}
# compiler ---------------------------------------------------------------------
@@ -454,6 +457,10 @@ config("compiler") {
@@ -454,6 +457,11 @@ config("compiler") {
}
}
+ if (is_openbsd) {
+ ldflags += [ "-Wl,-z,wxneeded" ]
+ ldflags += [ "-Wl,--no-execute-only" ]
+ }
+
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -529,7 +536,7 @@ config("compiler") {
@@ -529,7 +537,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -39,7 +40,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -808,7 +815,7 @@ config("compiler") {
@@ -808,7 +816,7 @@ config("compiler") {
# lldb doesn't have the needed changes yet.
# * Fuchsia isn't supported as zxdb doesn't support simple template names yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@ -48,7 +49,7 @@ Index: build/config/compiler/BUILD.gn
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -958,7 +965,7 @@ config("compiler_cpu_abi") {
@@ -958,7 +966,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -57,7 +58,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -973,7 +980,7 @@ config("compiler_cpu_abi") {
@@ -973,7 +981,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -66,7 +67,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1307,7 +1314,7 @@ config("compiler_deterministic") {
@@ -1307,7 +1315,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -75,7 +76,7 @@ Index: build/config/compiler/BUILD.gn
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1359,7 +1366,7 @@ config("compiler_deterministic") {
@@ -1359,7 +1367,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -84,7 +85,7 @@ Index: build/config/compiler/BUILD.gn
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1600,7 +1607,7 @@ config("default_warnings") {
@@ -1600,7 +1608,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -93,7 +94,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1779,7 +1786,7 @@ config("no_chromium_code") {
@@ -1779,7 +1787,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -102,7 +103,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2301,7 +2308,7 @@ config("afdo_optimize_size") {
@@ -2301,7 +2309,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -111,7 +112,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2317,7 +2324,7 @@ config("afdo") {
@@ -2317,7 +2325,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -120,7 +121,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2464,7 +2471,8 @@ config("symbols") {
@@ -2464,7 +2472,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

2
www/iridium/Makefile
View File

@ -13,7 +13,7 @@ COMMENT= Iridium browser
V= 2023.01.109
REVISION= 3
REVISION= 4
DISTNAME= iridium-browser-${V}
PKGNAME= iridium-${V}

35
www/iridium/patches/patch-build_config_compiler_BUILD_gn
View File

@ -29,18 +29,19 @@ Index: build/config/compiler/BUILD.gn
":compiler_codegen",
":compiler_deterministic",
]
@@ -452,6 +457,10 @@ config("compiler") {
@@ -452,6 +457,11 @@ config("compiler") {
}
}
+ if (is_openbsd) {
+ ldflags += [ "-Wl,-z,wxneeded" ]
+ ldflags += [ "-Wl,--no-execute-only" ]
+ }
+
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -912,7 +921,7 @@ config("compiler_cpu_abi") {
@@ -912,7 +922,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -49,7 +50,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -927,7 +936,7 @@ config("compiler_cpu_abi") {
@@ -927,7 +937,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -58,7 +59,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1272,6 +1281,27 @@ config("compiler_deterministic") {
@@ -1272,6 +1282,27 @@ config("compiler_deterministic") {
}
}
@ -86,7 +87,7 @@ Index: build/config/compiler/BUILD.gn
config("rustc_revision") {
if (enable_rust && defined(rustc_version)) {
# Similar to the above config, this is here so that all files get
@@ -1493,7 +1523,7 @@ config("default_warnings") {
@@ -1493,7 +1524,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -95,7 +96,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1658,7 +1688,7 @@ config("no_chromium_code") {
@@ -1658,7 +1689,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -104,7 +105,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -1970,8 +2000,7 @@ config("default_stack_frames") {
@@ -1970,8 +2001,7 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@ -114,7 +115,7 @@ Index: build/config/compiler/BUILD.gn
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
@@ -2016,8 +2045,7 @@ config("xoptimize") {
@@ -2016,8 +2046,7 @@ config("xoptimize") {
}
# Turn off optimizations.
@ -124,7 +125,7 @@ Index: build/config/compiler/BUILD.gn
if (is_win) {
cflags = [
"/Od", # Disable optimization.
@@ -2057,8 +2085,7 @@ config("xno_optimize") {
@@ -2057,8 +2086,7 @@ config("xno_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and should
# be used sparingly.
@ -134,7 +135,7 @@ Index: build/config/compiler/BUILD.gn
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
@@ -2091,8 +2118,7 @@ config("xoptimize_max") {
@@ -2091,8 +2119,7 @@ config("xoptimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@ -144,7 +145,7 @@ Index: build/config/compiler/BUILD.gn
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
@@ -2118,8 +2144,7 @@ config("xoptimize_speed") {
@@ -2118,8 +2145,7 @@ config("xoptimize_speed") {
}
}
@ -154,7 +155,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
@@ -2185,7 +2210,7 @@ config("afdo_optimize_size") {
@@ -2185,7 +2211,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -163,7 +164,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2201,7 +2226,7 @@ config("afdo") {
@@ -2201,7 +2227,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -172,7 +173,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2239,8 +2264,7 @@ config("win_pdbaltpath") {
@@ -2239,8 +2265,7 @@ config("win_pdbaltpath") {
}
# Full symbols.
@ -182,7 +183,7 @@ Index: build/config/compiler/BUILD.gn
if (is_win) {
if (is_clang) {
cflags = [ "/Z7" ] # Debug information in the .obj files.
@@ -2349,7 +2373,8 @@ config("xsymbols") {
@@ -2349,7 +2374,8 @@ config("xsymbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
@ -192,7 +193,7 @@ Index: build/config/compiler/BUILD.gn
if (is_apple) {
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
# Make sure we don't use constructor homing on mac.
@@ -2372,8 +2397,7 @@ config("xsymbols") {
@@ -2372,8 +2398,7 @@ config("xsymbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to user
# when crash happens in unittests running on buildbot.
@ -202,7 +203,7 @@ Index: build/config/compiler/BUILD.gn
if (is_win) {
# Functions, files, and line tables only.
cflags = []
@@ -2446,8 +2470,7 @@ config("xminimal_symbols") {
@@ -2446,8 +2471,7 @@ config("xminimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts function
# names in the final debug information.

2
www/ungoogled-chromium/Makefile
View File

@ -11,6 +11,8 @@ COMMENT= Chromium browser sans integration with Google
V= 109.0.5414.119
UGV= ${V}-1
REVISION= 0
DISTNAME= ungoogled-chromium-${V}
DISTFILES+= ${CHROMIUM_DISTFILES} \

25
www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn
View File

@ -19,18 +19,19 @@ Index: build/config/compiler/BUILD.gn
}
# compiler ---------------------------------------------------------------------
@@ -454,6 +457,10 @@ config("compiler") {
@@ -454,6 +457,11 @@ config("compiler") {
}
}
+ if (is_openbsd) {
+ ldflags += [ "-Wl,-z,wxneeded" ]
+ ldflags += [ "-Wl,--no-execute-only" ]
+ }
+
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -529,7 +536,7 @@ config("compiler") {
@@ -529,7 +537,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -39,7 +40,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -808,7 +815,7 @@ config("compiler") {
@@ -808,7 +816,7 @@ config("compiler") {
# lldb doesn't have the needed changes yet.
# * Fuchsia isn't supported as zxdb doesn't support simple template names yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@ -48,7 +49,7 @@ Index: build/config/compiler/BUILD.gn
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -958,7 +965,7 @@ config("compiler_cpu_abi") {
@@ -958,7 +966,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -57,7 +58,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -973,7 +980,7 @@ config("compiler_cpu_abi") {
@@ -973,7 +981,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -66,7 +67,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1307,7 +1314,7 @@ config("compiler_deterministic") {
@@ -1307,7 +1315,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -75,7 +76,7 @@ Index: build/config/compiler/BUILD.gn
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1359,7 +1366,7 @@ config("compiler_deterministic") {
@@ -1359,7 +1367,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -84,7 +85,7 @@ Index: build/config/compiler/BUILD.gn
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1600,7 +1607,7 @@ config("default_warnings") {
@@ -1600,7 +1608,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -93,7 +94,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1779,7 +1786,7 @@ config("no_chromium_code") {
@@ -1779,7 +1787,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -102,7 +103,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2301,7 +2308,7 @@ config("afdo_optimize_size") {
@@ -2301,7 +2309,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -111,7 +112,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2317,7 +2324,7 @@ config("afdo") {
@@ -2317,7 +2325,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -120,7 +121,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2464,7 +2471,8 @@ config("symbols") {
@@ -2464,7 +2472,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}