diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
| commit | 13ee5b072d4e3ee1e06f308014d7f298da681f62 (patch) | |
| tree | 2c29f123993acaded9899f4ff728f288f25bdbc3 /www/iridium/files/patch-sandbox_linux_BUILD.gn | |
| parent | security/n2n: Cleanup Makefile (diff) | |
www/iridium: Update to 2018.5.67
Diffstat (limited to 'www/iridium/files/patch-sandbox_linux_BUILD.gn')
| -rw-r--r-- | www/iridium/files/patch-sandbox_linux_BUILD.gn | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn index 4073d740e794..01133217e052 100644 --- a/www/iridium/files/patch-sandbox_linux_BUILD.gn +++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn @@ -1,11 +1,47 @@ ---- sandbox/linux/BUILD.gn.orig 2017-04-24 14:40:29 UTC -+++ sandbox/linux/BUILD.gn -@@ -284,7 +284,7 @@ if (is_linux) { - # TODO fix this and re-enable this warning. - "-Wno-sign-compare", - ] -- ldflags = [ "-pie", "-Wl,--no-keep-memory" ] -+ ldflags = [ "-pie" ] +--- sandbox/linux/BUILD.gn.orig 2018-05-17 22:11:48.947218775 +0200 ++++ sandbox/linux/BUILD.gn 2018-08-16 11:54:16.112049000 +0200 +@@ -12,12 +12,12 @@ + } + + declare_args() { +- compile_suid_client = is_linux ++ compile_suid_client = is_linux && !is_bsd + +- compile_credentials = is_linux ++ compile_credentials = is_linux && !is_bsd + + # On Android, use plain GTest. +- use_base_test_suite = is_linux ++ use_base_test_suite = is_linux && !is_bsd + } - import("//build/config/compiler/compiler.gni") - import("//build/config/sanitizers/sanitizers.gni") + if (is_nacl_nonsfi) { +@@ -397,7 +397,7 @@ + public_deps += [ ":sandbox_services_headers" ] + } + +- if (is_nacl_nonsfi) { ++ if (is_nacl_nonsfi || is_bsd) { + cflags = [ "-fgnu-inline-asm" ] + + sources -= [ +@@ -405,6 +405,8 @@ + "services/init_process_reaper.h", + "services/scoped_process.cc", + "services/scoped_process.h", ++ "services/syscall_wrappers.cc", ++ "services/syscall_wrappers.h", + "services/yama.cc", + "services/yama.h", + "syscall_broker/broker_channel.cc", +@@ -421,6 +423,10 @@ + "syscall_broker/broker_permission_list.h", + "syscall_broker/broker_process.cc", + "syscall_broker/broker_process.h", ++ ] ++ sources += [ ++ "services/libc_interceptor.cc", ++ "services/libc_interceptor.h", + ] + } else if (!is_android) { + sources += [ |
