Commit d3b52a1f authored by tagattie's avatar tagattie
Browse files
parent 0d10636c
......@@ -16152,3 +16152,4 @@ x11-toolkits/c++-gtk-utils||2021-02-07|Abandoned library not depended on
textproc/xml-i18n-tools|textproc/intltool|2021-02-07|Has been replaced by intltools long ago
sysutils/hal||2021-02-08|Has been abandonned upstream long ago, replacement have now hit the ports tree almost everywhere
sysutils/hal-info||2021-02-08|Has no use without hal which has been removed
devel/electron9|devel/electron11|2021-02-08|VSCode update requires a newer major version
......@@ -533,7 +533,7 @@
SUBDIR += efl
SUBDIR += egypt
SUBDIR += eiffelstudio
SUBDIR += electron9
SUBDIR += electron11
SUBDIR += elf
SUBDIR += elfio
SUBDIR += elfkickers
......
......@@ -3,15 +3,12 @@
PORTNAME= electron
DISTVERSIONPREFIX= v
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v9.4.0/:chromium \
https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
DISTFILES= chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
......@@ -52,6 +49,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libsecret-1.so:security/libsecret \
libnss3.so:security/nss \
libexpat.so:textproc/expat2 \
libxkbcommon.so:x11/libxkbcommon \
libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
......@@ -121,19 +119,19 @@ PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
# Official chromium version containing "gn" which is known to work
CHROMIUM_OFFICIAL_VER= 83.0.4103.119
CHROMIUM_OFFICIAL_VER= 87.0.4280.141
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
CHROMIUM_VER= 83.0.4103.122
CHROMIUM_VER= 87.0.4280.141
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
CHROMIUM_NODE_MODULES_HASH= a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
CHROMIUM_TEST_FONTS_HASH= a22de844e32a3f720d219e3911c3da3478039f89
CHROMIUM_TEST_FONTS_HASH= cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb
# See ${WRKSRC}/electron/DEPS for NODE_VER
NODE_VER= 12.14.1
NODE_VER= 12.18.3
# See ${WRKSRC}/electron/DEPS for NAN_VER
NAN_VER= 2ee313aaca52e2b478965ac50eb5082520380d1b
NAN_VER= 2c4ee8a32a299eada3cd6e468bbd0a473bfea96d
YARN_TIMESTAMP= 1611835338
YARN_TIMESTAMP= 1612596580
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
......@@ -200,16 +198,17 @@ post-extract:
${WRKSRC}/third_party/nan
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
${WRKSRC}/third_party/electron_node
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
# Take in clang-format from official chromium distribution
${MKDIR} ${WRKSRC}/buildtools/freebsd
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/buildtools/linux64/clang-format \
${WRKSRC}/buildtools/freebsd
# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/buildtools/linux64/clang-format \
# ${WRKSRC}/buildtools/freebsd
${CP} ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
# Take in gn source files from official chromium distribution
${RM} -r ${WRKSRC}/tools/gn
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
${WRKSRC}/tools/gn
# ${RM} -r ${WRKSRC}/tools/gn
# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
# ${WRKSRC}/tools/gn
# Remove unnecessary files
${RM} -r ${WRKSRC}/third_party/jdk/current
${RM} -r ${WRKSRC}/third_party/jdk/extras
......@@ -232,7 +231,7 @@ pre-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng \
libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
do-configure:
# GN generator bootstrapping and generating ninja files
......@@ -286,6 +285,8 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
.endfor
cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
post-install-DIST-on:
......
# $FreeBSD$
ELECTRON_VER= 9.4.2
ELECTRON_VER= 11.2.3
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
TIMESTAMP = 1612597534
SHA256 (electron/chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
SIZE (electron/chromium-87.0.4280.141.tar.xz) = 856467564
SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b
SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260
SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
SHA256 (electron/electron-yarn-cache-11.2.3.tar.xz) = d290fb7de0cd3bfb8f59ef0775d6e5619cfe4a55f3d392b4b8bc7dc08d207d0c
SIZE (electron/electron-yarn-cache-11.2.3.tar.xz) = 27493896
SHA256 (electron/electron-electron-v11.2.3_GH0.tar.gz) = e3bd09676c69829633bce8d3a05417c5ffe2b40dbebe13f327675e31d49bfe0f
SIZE (electron/electron-electron-v11.2.3_GH0.tar.gz) = 6267701
SHA256 (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 6e2730c9284906a0f34cd7c64540c891c0e363323c46e9fc005c6366ddf389c6
SIZE (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 77078855
SHA256 (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = e4ff33afb043329429c9551d3cc983786553a310a7d61ee313485ba3ac9b2b15
SIZE (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = 178328
{
"name": "electron",
"version": "9.4.2",
"version": "11.2.3",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
"@electron/docs-parser": "^0.4.2",
"@electron/typescript-definitions": "^8.6.4",
"@electron/docs-parser": "^0.10.0",
"@electron/typescript-definitions": "^8.7.5",
"@octokit/auth-app": "^2.10.0",
"@octokit/rest": "^16.3.2",
"@primer/octicons": "^9.1.1",
"@types/basic-auth": "^1.1.2",
"@octokit/rest": "^18.0.3",
"@primer/octicons": "^10.0.0",
"@types/basic-auth": "^1.1.3",
"@types/busboy": "^0.2.3",
"@types/chai": "^4.1.7",
"@types/chai-as-promised": "^7.1.0",
"@types/dirty-chai": "^2.0.0",
"@types/express": "^4.16.1",
"@types/fs-extra": "^5.0.5",
"@types/mocha": "^5.2.6",
"@types/node": "^12.0.10",
"@types/rimraf": "^3.0.0",
"@types/semver": "^6.0.1",
"@types/chai": "^4.2.12",
"@types/chai-as-promised": "^7.1.3",
"@types/dirty-chai": "^2.0.2",
"@types/express": "^4.17.7",
"@types/fs-extra": "^9.0.1",
"@types/mocha": "^7.0.2",
"@types/node": "^12.12.6",
"@types/semver": "^7.3.3",
"@types/send": "^0.14.5",
"@types/split": "^1.0.0",
"@types/uuid": "^3.4.6",
"@types/webpack": "^4.4.32",
"@types/webpack-env": "^1.13.9",
"@typescript-eslint/eslint-plugin": "^2.6.0",
"@typescript-eslint/parser": "^2.6.0",
"asar": "^1.0.0",
"@types/webpack": "^4.41.21",
"@types/webpack-env": "^1.15.2",
"@typescript-eslint/eslint-plugin": "^3.9.1",
"@typescript-eslint/parser": "^3.9.1",
"asar": "^3.0.3",
"check-for-leaks": "^1.2.1",
"colors": "^1.1.2",
"colors": "^1.4.0",
"dotenv-safe": "^4.0.4",
"dugite": "^1.45.0",
"eslint": "^5.13.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-mocha": "^5.2.0",
"eslint-plugin-node": "^8.0.1",
"eslint-plugin-standard": "^4.0.0",
"eslint": "^7.4.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-mocha": "^7.0.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-typescript": "^0.14.0",
"express": "^4.16.4",
"folder-hash": "^2.1.1",
"fs-extra": "^7.0.1",
"fs-extra": "^9.0.1",
"husky": "^2.2.0",
"klaw": "^3.0.0",
"lint": "^1.1.2",
"lint-staged": "^8.1.0",
"minimist": "^1.2.0",
"lint-staged": "^10.2.11",
"minimist": "^1.2.5",
"nugget": "^2.0.1",
"null-loader": "^4.0.0",
"pre-flight": "^1.1.0",
"remark-cli": "^4.0.0",
"remark-preset-lint-markdown-style-guide": "^2.1.1",
"request": "^2.88.0",
"request": "^2.88.2",
"semver": "^5.6.0",
"shx": "^0.3.2",
"standard-markdown": "^5.0.0",
"standard-markdown": "^6.0.0",
"sumchecker": "^2.0.2",
"tap-xunit": "^2.4.1",
"temp": "^0.8.3",
"timers-browserify": "1.4.2",
"ts-loader": "^6.0.2",
"ts-node": "^6.0.3",
"typescript": "^3.5.2",
"ts-loader": "^8.0.2",
"ts-node": "6.2.0",
"typescript": "^4.0.2",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12"
},
......@@ -72,7 +71,7 @@
"generate-version-json": "node script/generate-version-json.js",
"lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
"lint:js": "node ./script/lint.js --js",
"lint:clang-format": "python script/run-clang-format.py -r -c shell/ chromium_src/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
"lint:clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
"lint:cpp": "node ./script/lint.js --cc",
"lint:objc": "node ./script/lint.js --objc",
"lint:py": "node ./script/lint.js --py",
......@@ -107,36 +106,32 @@
},
"lint-staged": {
"*.{js,ts}": [
"node script/lint.js --js --fix --only --",
"git add"
"node script/lint.js --js --fix --only --"
],
"*.{js,ts,d.ts}": [
"node script/gen-filenames.js",
"git add"
"ts-node script/gen-filenames.ts"
],
"*.{cc,mm,c,h}": [
"python script/run-clang-format.py -r -c --fix",
"git add"
"python script/run-clang-format.py -r -c --fix"
],
"*.md": [
"remark -qf"
"npm run lint:docs"
],
"*.{gn,gni}": [
"npm run gn-check",
"python script/run-gn-format.py",
"git add"
"python script/run-gn-format.py"
],
"*.py": [
"node script/lint.js --py --fix --only --",
"git add"
"node script/lint.js --py --fix --only --"
],
"docs/api/**/*.md": [
"node script/gen-filenames.js",
"ts-node script/gen-filenames.ts",
"python script/check-trailing-whitespace.py --fix",
"git add filenames.auto.gni"
],
"{*.patch,.patches}": [
"node script/lint.js --patches --only --"
"node script/lint.js --patches --only --",
"ts-node script/check-patch-diff.ts"
],
"DEPS": [
"node script/gen-hunspell-filenames.js"
......
--- BUILD.gn.orig 2020-06-03 09:02:09 UTC
--- BUILD.gn.orig 2021-01-07 00:36:17 UTC
+++ BUILD.gn
@@ -418,7 +418,7 @@ group("gn_all") {
@@ -422,7 +422,7 @@ group("gn_all") {
]
}
- if (is_linux || is_android) {
+ if ((is_linux && !is_bsd) || is_android) {
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -459,8 +459,6 @@ group("gn_all") {
@@ -463,8 +463,6 @@ group("gn_all") {
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
......@@ -18,7 +18,7 @@
"//testing:empty_main",
]
@@ -515,10 +513,6 @@ group("gn_all") {
@@ -519,10 +517,6 @@ group("gn_all") {
"//chrome/test:load_library_perf_tests",
"//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
......@@ -29,7 +29,7 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
@@ -579,10 +573,6 @@ group("gn_all") {
@@ -582,10 +576,6 @@ group("gn_all") {
"//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
......@@ -40,7 +40,7 @@
]
if (!is_android) {
@@ -656,7 +646,7 @@ group("gn_all") {
@@ -663,7 +653,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
......@@ -49,16 +49,25 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -789,7 +779,6 @@ group("gn_all") {
@@ -678,7 +668,7 @@ group("gn_all") {
}
}
- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) {
+ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) {
deps += [
"//third_party/crashpad/crashpad:crashpad_tests",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
@@ -797,7 +787,6 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_perftests",
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
]
if (is_desktop_linux && use_ozone) {
deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
@@ -1072,7 +1061,7 @@ if (!is_ios) {
]
if (is_android) {
deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
@@ -1090,7 +1079,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
- if (!is_win && !is_android) {
......@@ -66,16 +75,16 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1081,7 +1070,7 @@ if (!is_ios) {
@@ -1099,7 +1088,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
- if (is_linux) {
+ if (is_linux && !is_bsd) {
- if (is_linux || is_chromeos) {
+ if ((is_linux && !is_bsd) || is_chromeos) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1274,9 +1263,6 @@ group("chromium_builder_perf") {
@@ -1296,9 +1285,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
......
--- apps/app_restore_service_browsertest.cc.orig 2020-05-26 08:03:12 UTC
--- apps/app_restore_service_browsertest.cc.orig 2021-01-07 00:36:17 UTC
+++ apps/app_restore_service_browsertest.cc
@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
}
// Flaky: crbug.com/269613
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
#define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored
#else
#define MAYBE_FileAccessIsRestored FileAccessIsRestored
--- apps/ui/views/app_window_frame_view.cc.orig 2020-05-26 07:48:14 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2021-01-07 00:36:17 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const {
gfx::Rect window_bounds = client_bounds;
......
--- ash/display/mirror_window_controller.cc.orig 2020-05-26 07:48:14 UTC
--- ash/display/mirror_window_controller.cc.orig 2021-01-07 00:36:17 UTC
+++ ash/display/mirror_window_controller.cc
@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
......
--- base/BUILD.gn.orig 2020-05-26 08:03:14 UTC
--- base/BUILD.gn.orig 2021-01-07 00:36:18 UTC
+++ base/BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
@@ -53,7 +53,7 @@ declare_args() {
# replacement base::Location::Current(). On by default in non-official builds
# for testing purposes.
# TODO(https://crbug.com/974061): remove this eventually.
......@@ -9,20 +9,19 @@
# Unsafe developer build. Has developer-friendly features that may weaken or
# disable security measures like sandboxing or ASLR.
@@ -929,7 +929,7 @@ jumbo_component("base") {
@@ -878,7 +878,7 @@ component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
- if (!is_nacl && !is_mac && !is_ios) {
+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"profiler/stack_copier_signal.cc",
"profiler/stack_copier_signal.h",
@@ -938,6 +938,12 @@ jumbo_component("base") {
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -889,6 +889,11 @@ component("base") {
"profiler/thread_delegate_posix.h",
]
}
+
+ if (is_bsd) {
+ sources += [
+ "profiler/stack_sampler_posix.cc",
......@@ -31,25 +30,34 @@
}
if (is_win) {
@@ -1321,7 +1327,7 @@ jumbo_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
@@ -1295,7 +1300,7 @@ component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) &&
if (!use_sysroot &&
- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
+ (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) &&
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
@@ -1347,7 +1353,7 @@ jumbo_component("base") {
"allocator/allocator_shim_override_glibc_weak_symbols.h",
]
deps += [ "//base/allocator:tcmalloc" ]
- } else if (is_linux && use_allocator == "none") {
+ } else if ((is_linux && !is_bsd) && use_allocator == "none") {
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
} else if (is_android && use_allocator == "none") {
sources += [
@@ -1942,6 +1948,33 @@ jumbo_component("base") {
@@ -1342,7 +1347,7 @@ component("base") {
"allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc",
]
}
- if (is_chromeos || is_linux) {
+ if ((is_chromeos || is_linux) && !is_bsd) {
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
}
if (is_win) {
@@ -1811,7 +1816,7 @@ component("base") {
]
}
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux || is_chromeos || is_android) && !is_bsd) {
sources += [
"allocator/partition_allocator/spinning_futex_linux.cc",
"allocator/partition_allocator/spinning_futex_linux.h",
@@ -1956,6 +1961,34 @@ component("base") {
}
}
......@@ -79,29 +87,26 @@
+ "util" # process_metrics_freebsd
+ ]
+ }
+
+
# iOS
if (is_ios) {
sources -= [
@@ -2898,7 +2931,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
@@ -3069,7 +3102,7 @@ test("base_unittests") {
]
- if (!is_nacl && !is_mac && !is_ios) {
+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
sources += [ "profiler/stack_copier_signal_unittest.cc" ]
}
}
@@ -3087,6 +3120,12 @@ test("base_unittests") {
manifest = "//build/config/fuchsia/tests.cmx"
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
sources += [ "debug/proc_maps_linux_unittest.cc" ]
}
+
+ if (is_bsd) {
+ sources -= [
+ "debug/proc_maps_linux_unittest.cc",
+ ]
+ }
if (!is_fuchsia && !is_ios) {
sources += [ "files/file_locking_unittest.cc" ]
@@ -3110,7 +3143,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-05-26 07:48:14 UTC
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-01-07 00:36:18 UTC
+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
@@ -6,18 +6,28 @@
#include "base/compiler_specific.h"
......
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2020-05-26 07:48:14 UTC
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-01-07 00:36:18 UTC
+++ base/allocator/allocator_shim_override_libc_symbols.h
@@ -10,7 +10,7 @@
#endif
......
--- base/allocator/allocator_shim_unittest.cc.orig 2020-05-26 08:03:14 UTC
--- base/allocator/allocator_shim_unittest.cc.orig 2021-01-07 00:36:18 UTC
+++ base/allocator/allocator_shim_unittest.cc
@@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
#endif // !OS_WIN
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)
-#if !defined(OS_WIN) && !defined(OS_APPLE)
+#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD)
void* memalign_ptr = memalign(128, 53);
ASSERT_NE(nullptr, memalign_ptr);
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
@@ -361,7 +361,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
// pvalloc rounds the size up to the next page.
@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
-#endif // !OS_WIN && !OS_MACOSX
+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD
#endif // !defined(OS_ANDROID)
-#endif // !OS_WIN && !OS_APPLE
+#endif // !OS_WIN && !OS_APPLE && !OS_BSD
char* realloc_ptr = static_cast<char*>(malloc(10));
strcpy(realloc_ptr, "foobar");
@@ -377,13 +377,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
// See allocator_shim_override_glibc_weak_symbols.h for why we intercept
// internal libc symbols.
@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {