mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-05-10 17:04:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

testing/dart: upgrade to 3.0.0

Browse source
This commit is contained in:
Lauren N. Liberda 2023-05-13 09:56:24 +00:00 • committed by alice
parent 38552bf4f3
commit e4081f6095
14 changed files with 224 additions and 389 deletions

185
testing/dart/APKBUILD
View file

@ -1,17 +1,16 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
pkgname=dart
pkgver=2.19.6
pkgrel=3
_bootstrap=2.19.0
pkgver=3.0.0
pkgrel=0
_bootstrap=3.0.0_alpha369-r0
pkgdesc="Dart is a client-optimized language for fast apps on any platform"
url="https://dart.dev/"
arch="aarch64 x86_64"
arch="aarch64 armv7 x86_64"
license="BSD-3-Clause"
makedepends="
clang
curl
dart-bootstrap
dart-stage0=>$_bootstrap
gn
icu-dev
lld
@ -19,33 +18,41 @@ makedepends="
python3
ripgrep
samurai
sed
zlib-dev
"
subpackages="
$pkgname-dev
$pkgname-devtools
$pkgname-sdk
"
subpackages="$pkgname-sdk"
case "$pkgver" in
*.*.*_pre*)
_canonver="${pkgver/_pre/-}"
_canonver="${_canonver/-r/.}.dev"
;;
*.*.*_beta*)
_canonver="${pkgver/_beta/-}"
_canonver="${_canonver/-r/.}.beta"
;;
*.*.*)
_canonver="$pkgver"
;;
esac
source="
https://s3.sakamoto.pl/lnl-aports-snapshots/dart-sdk-$pkgver.tar.xz
https://s3.sakamoto.pl/lnl-aports-snapshots/dart-sdk-$_canonver.tar.xz
flags.patch
host-compiler.patch
gcc13.patch
host-arm.patch
look-around.patch
musl-sigsetjmp.patch
no-analytics.patch
no-werror.patch
musl-reinterpret.patch
shim-headers.patch
fix-pkg-config.patch
toolhack.patch
unbundle-icu.patch
unbundle-zlib.patch
alpine-target.patch
dart2js
use-lld.patch
where-we-are-heading-prefixes-are-not-needed.patch
"
builddir="$srcdir/dart-sdk-$pkgver"
builddir="$srcdir/dart-sdk-$_canonver"
provides="dart-bootstrap"
provider_priority=100
@ -58,7 +65,7 @@ snapshot() {
echo "
solutions = [{
'name': 'sdk',
'url': 'https://dart.googlesource.com/sdk.git@$pkgver',
'url': 'https://dart.googlesource.com/sdk.git@$_canonver',
}]
target_cpu = ['x64', 'x86', 'arm64', 'arm', 'ppc64', 'riscv64', 's390x']
target_cpu_only = True
@ -70,10 +77,10 @@ target_cpu_only = True
rm -f "$elf"
done
mv sdk dart-sdk-$pkgver
mv sdk dart-sdk-$_canonver
msg "generating tarball.."
tar -cf dart-sdk-$pkgver.tar \
tar -cf dart-sdk-$_canonver.tar \
--exclude="ChangeLog*" \
--exclude="sdk/buildtools/*/clang" \
--exclude="third_party/fuchsia/sdk/linux/arch" \
@ -81,38 +88,43 @@ target_cpu_only = True
--exclude-backups \
--exclude-caches-all \
--exclude-vcs \
dart-sdk-$pkgver
dart-sdk-$_canonver
xz -T0 -e -9 -vv -k dart-sdk-$pkgver.tar
xz -T0 -e -9 -vv -k dart-sdk-$_canonver.tar
}
case "$CARCH" in
aarch64) _arch="arm64" ;;
armv7) _arch="arm" ;;
x86) _arch="ia32" ;;
x86_64) _arch="x64" ;;
aarch64)
_arch="arm64"
_out="$builddir/out/ReleaseARM64"
;;
armv7)
_arch="arm"
_out="$builddir/out/ReleaseARM"
;;
riscv64)
_arch="riscv64"
_out="$builddir/out/ReleaseRISCV64"
;;
x86_64)
_arch="x64"
_out="$builddir/out/ReleaseX64"
;;
esac
prepare() {
default_prepare
# xD https://github.com/dart-lang/sdk/blob/2.18.0/build/toolchain/linux/BUILD.gn#L24-L30
case "$CARCH" in
aarch64) clang_arch="arm64" ;;
*) clang_arch="x64" ;;
esac
mkdir -p .git/logs
echo '' > .git/logs/HEAD
# shut up on clang
mkdir -p buildtools/linux-$clang_arch/clang/.versions
echo '{"instance_id":"system"}' > buildtools/linux-$clang_arch/clang/.versions/clang.cipd_version
# bind bootstrapped interpreter
mkdir -p tools/sdks/dart-sdk/bin/
ln -s /usr/bin/dart tools/sdks/dart-sdk/bin/dart
ln -s /usr/bin/dart2js tools/sdks/dart-sdk/bin/dart2js
rm -rf tools/sdks/dart-sdk
ln -s /usr/lib/dart tools/sdks/dart-sdk
ln -s /usr/bin/gn buildtools/gn
mkdir -p buildtools/ninja
ln -s /usr/bin/samu buildtools/ninja/ninja
# gclient hooks
python3 tools/generate_package_config.py
@ -150,83 +162,80 @@ prepare() {
build() {
local gn_args="
create_kernel_service_snapshot=true
dart_debug=false
dart_platform_sdk=false
dart_runtime_mode=\"release\"
dart_target_arch=\"$_arch\"
dart_snapshot_kind=\"app-jit\"
dart_sysroot=\"\"
dart_use_tcmalloc=false
dart_version_git_info=false
is_clang=true
is_debug=false
is_product=true
is_release=true
target_cpu=\"$_arch\"
use_system_icu=true
use_system_zlib=true
use_thin_lto=true
verify_sdk_hash=false
"
msg "Generating ninja files"
gn gen out --args="$(echo $gn_args)"
msg "Building"
ninja -C out create_sdk runtime_precompiled gen_kernel
python3 ./tools/build.py \
--no-clang \
--arch="$_arch" \
--mode=release \
--no-goma \
--no-verify-sdk-hash \
--gn-args="$(echo $gn_args)" \
create_sdk runtime
}
check() {
# check sanity
./out/dart --version
"$_out"/dart-sdk/bin/dart --version
}
package() {
install -Dm755 out/dart "$pkgdir"/usr/lib/dart/bin/dart
install -Dm755 out/dart-sdk/bin/dartaotruntime "$pkgdir"/usr/lib/dart/bin/dartaotruntime
cp -r out/dart-sdk/lib "$pkgdir"/usr/lib/dart/lib
mkdir -p "$pkgdir"/usr/lib/dart/bin/resources/
cp -r out/devtools "$pkgdir"/usr/lib/dart/bin/resources/devtools
cp -r out/dart-sdk/bin/snapshots "$pkgdir"/usr/lib/dart/bin/snapshots
install -Dm755 out/gen_snapshot "$pkgdir"/usr/lib/dart/bin/utils/gen_snapshot
mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/lib "$pkgdir"/usr/include
mkdir -p "$pkgdir"/usr/include
cp -r out/dart-sdk/include "$pkgdir"/usr/include/dart
cp -r "$_out"/dart-sdk "$pkgdir"/usr/lib/dart
mkdir -p "$pkgdir"/usr/bin
ln -s /usr/lib/dart/bin/dart "$pkgdir"/usr/bin/dart
ln -s /usr/lib/dart/bin/dartaotruntime "$pkgdir"/usr/bin/dartaotruntime
ln -s ../lib/dart/include "$pkgdir"/usr/include/dart
ln -s ../lib/dart/bin/dart "$pkgdir"/usr/bin/dart
ln -s ../lib/dart/bin/dartaotruntime "$pkgdir"/usr/bin/dartaotruntime
find "$pkgdir"/usr/lib/dart/bin/resources/devtools -type f -exec chmod 644 {} \;
echo "$pkgver" > "$pkgdir"/usr/lib/dart/version
}
sdk() {
depends="$pkgname=$pkgver-r$pkgrel"
# do the stuff -dev does by default here
default_dev
for snap in analysis_server dart2js dartdevc dds frontend_server gen_kernel kernel-service kernel_worker; do
# must be set after default_dev or gets cleared
depends="dart=$pkgver-r$pkgrel"
provides="dart-devtools=$pkgver-r$pkgrel"
_snapshots="
analysis_server
dart2js
dartdevc
dds
frontend_server
gen_kernel
kernel-service
kernel_worker
"
for snap in $_snapshots; do
amove usr/lib/dart/bin/snapshots/$snap.dart.snapshot
done
amove usr/lib/dart/bin/snapshots/dart2wasm_product.snapshot
amove usr/lib/dart/bin/utils
amove usr/lib/dart/lib
install -Dm755 "$srcdir"/dart2js "$pkgdir"/usr/bin/dart2js
}
devtools() {
amove usr/lib/dart/bin/resources/devtools
}
sha512sums="
1972e892c7665fdbf20ef75139b92d3c8b5ebaddde10d791bd41651b7a1386245c0d3237e9fb48e0718e7b21fa166ce2a521b5df337bd8b04dc5cebfd8725a97 dart-sdk-2.19.6.tar.xz
322d26d4b4bfdc106229045aafee5610f3d14aa0482d72ff320dbacf58f50df58d339a8d059a08e031ac2afcaff388184e358ae6626b3c2b96e3ace21fcd575d dart-sdk-3.0.0.tar.xz
3094bf6119cc2546283c276fc682163b2fceb7ecc0b6625f75d3398b054e64e37fa49c200de4759fea7def9a3fe3211c7eb4ecc2bcf23e32774cdc46fc14d8c0 flags.patch
d8d3c9a1d37a13043952d662a6477eb2427f87f4456b47fe6602426a636c598979e8b12bfe32e8e668c97ef551fa22febfe15e81d232ba31187e7e8ce741d9dc host-compiler.patch
790695945d308411f2101d7735c2c178752df109a26eb8920e5a7ec853534d35c65bf3b234b1dec5a9d052cbbff0f00c066079bff26de4c9d5e568386f5f8cfd gcc13.patch
895ca9710ceb06141b7be8acdc5159c3b8a2066fd669f11cc9bd798fd6715ad2b1d613e16e08e57b74d89b63b69699e42638a1de317a53114d67a7999807be59 host-arm.patch
23065d27ad6c06d7832a7f7a2ac4e9a671acd0da1acd33ac2e7a7c57c85b2bda1207445255ba34dae3b5f203d3c98020f47ba0cdbf3c655282032669d345721a look-around.patch
28f1c2fc2cfdaac4c0ee55e7cfe13c7802d34b6dd0f1f9c6bf35eff6088eb551d860b1a9cfc14ee8323ae3a8342c471b7cc7a3582a4897c52a6a2a044436750a musl-sigsetjmp.patch
960d3c971d7b66e25c5e52c3189edd5356bc66a1aebc51b927b25abad238ec91b367f6c3ddb43ae6ab0d82180cba69ef9529903d5a7dce18dd75ef2bff2ae1d4 no-analytics.patch
b3aeb574042fe515a3f1cf7fc240f5976d9a86d599b33700caf23fd78f0b937b2ac7e0bdc590281ca18751b02a8e46899e6cdff2d498d23718588eadb1d84366 no-werror.patch
7ca0cd9e370679ee7d34225342db2dbc394f7355f4c06e7e81afb066be9cbb1c2c48fd56d9dfc15bbf8e9ddf6458d2c33ed3db1dace370cdb8dcbfbb240f75b3 musl-reinterpret.patch
d008eda9fcf5fb3f53d59ecbaec3920f942e129d7a166fd4255415ac960c91e69d367fb2c07f8cd27cb14813791d7cde45c94e43c054e9185d66562872a12eaf no-analytics.patch
e7f5c715d9ed01c36e8b60892332b1bc763a3f98ca87905e2102491c469db60ab21dba9b3e116e1a7ec3faef7d65b8fdd60d7148cfb848ef5a2b411a06f425cf no-werror.patch
f15e70279d383ebd2b202a123d7dd452ae0212022b372795cdfac530476d017c59352db136e673a06b9cacdbda0c152ce6c19735da637ebd366616f23a752ce4 shim-headers.patch
a55e52d5b8266d18c743cbd95eb6e2531623ca95a3c91a6a5193ffeabebce5979578b50c00bbbe93c0e5cb88fddd00184fded54ef845fefef4d76d972f4e78a9 fix-pkg-config.patch
14e4cf9584754995051f5a96a6b89f2557c9ba78d444854004328b45735afc2a3b1628aea57f1ce33f4a976169a7c5c57c0c466094b40fdf80f60b7c87ea6db6 toolhack.patch
6bd02f8a597c823021f8c5ec4e1f739dd8bceaf9817dd292245c01c5d25b5cc7ac6b9dac3c13e553e1b6fc81cf436b3f161973ff3a76188143b223dfbb48a9f8 unbundle-icu.patch
cbad6df474d6db74668cd49cf9a55d6899af2e9d40203fa1945339da0e66e90e1265440b83927a97ac9cf07d102347bbdc90b96cd27f5229207b389ccc70ef3e unbundle-zlib.patch
92736e8f132c7eb7693c70c1ca6ce2073788c10c1b6acfb4f2934d58b2b55c9f81700a49397b781264aad02eae2b1f6e1c3a2d13138b8943cceb9628eb051f1e alpine-target.patch
68487e1c9bf2caf6791e0ec996e107c23ac2bae7352e9772a7d96f6e467bfbb2c0094e18266081c04e2be67d40d8a9ae8a4bc9a0de93005cd82589839576b5f2 dart2js
72f4badf219264efee219338fd1e4f6cf7f1c4f84d03c5cb33832282df0a1a14f4941fb59037028a6a231956936e582d554efc7a34e88cb2d110a10bf0f727c7 use-lld.patch
9199d8d64c503d4a482ead55f8b895618b302db2d25d0340134dc6885444698176d1a53ce6c6d50c77b7cea1227a2ea3d7d9cb97b6368c43d8712f5cfdbfb818 where-we-are-heading-prefixes-are-not-needed.patch
"

26
testing/dart/alpine-target.patch
View file

@ -1,26 +0,0 @@
--- ./build/config/compiler/BUILD.gn.orig
+++ ./build/config/compiler/BUILD.gn
@@ -263,17 +263,17 @@
if (is_linux) {
if (is_clang) {
if (current_cpu == "arm") {
- cflags += [ "--target=armv7-linux-gnueabihf" ]
- ldflags += [ "--target=armv7-linux-gnueabihf" ]
+ cflags += [ "--target=armv7-alpine-linux-musleabihf" ]
+ ldflags += [ "--target=armv7-alpine-linux-musleabihf" ]
} else if (current_cpu == "arm64") {
- cflags += [ "--target=aarch64-linux-gnu" ]
- ldflags += [ "--target=aarch64-linux-gnu" ]
+ cflags += [ "--target=aarch64-alpine-linux-musl" ]
+ ldflags += [ "--target=aarch64-alpine-linux-musl" ]
} else if (current_cpu == "riscv32") {
cflags += [ "--target=riscv32-linux-gnu" ]
ldflags += [ "--target=riscv32-linux-gnu" ]
} else if (current_cpu == "riscv64") {
- cflags += [ "--target=riscv64-linux-gnu" ]
- ldflags += [ "--target=riscv64-linux-gnu" ]
+ cflags += [ "--target=riscv64-alpine-linux-musl" ]
+ ldflags += [ "--target=riscv64-alpine-linux-musl" ]
} else if (current_cpu == "x86") {
cflags += [ "--target=i386-linux-gnu" ]
ldflags += [ "--target=i386-linux-gnu" ]

2
testing/dart/dart2js
View file

@ -1,2 +0,0 @@
#!/bin/sh
exec dart run /usr/lib/dart/bin/snapshots/dart2js.dart.snapshot $@

12
testing/dart/fix-pkg-config.patch
View file

@ -1,12 +0,0 @@
upstreaming in https://github.com/dart-lang/sdk/pull/51614
--- a/build/config/linux/pkg-config.py
+++ b/build/config/linux/pkg-config.py
@@ -161,7 +161,7 @@
# For now just split on spaces to get the args out. This will break if
# pkgconfig returns quoted things with spaces in them, but that doesn't seem
# to happen in practice.
- all_flags = flag_string.strip().split(' ')
+ all_flags = flag_string.decode('utf-8').strip().split(' ')
except:
print("Could not run pkg-config.")
sys.exit(1)

30
testing/dart/gcc13.patch Normal file
View file

@ -0,0 +1,30 @@
--- a/runtime/bin/ffi_test/ffi_test_functions_generated.cc
+++ b/runtime/bin/ffi_test/ffi_test_functions_generated.cc
@@ -11,6 +11,7 @@
#include <sys/types.h>
#include <cmath>
+#include <cstdint>
#include <iostream>
#include <limits>
--- a/runtime/bin/ffi_test/ffi_test_functions.cc
+++ b/runtime/bin/ffi_test/ffi_test_functions.cc
@@ -13,6 +13,7 @@
#include <sys/types.h>
#include <cmath>
+#include <cstdint>
#include <iostream>
#include <limits>
--- a/runtime/bin/ffi_test/ffi_test_dynamic_library.cc
+++ b/runtime/bin/ffi_test/ffi_test_dynamic_library.cc
@@ -2,6 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+#include <cstdint>
#include <stdlib.h>
#include <string.h>
#include <iostream>

11
testing/dart/host-arm.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./tools/utils.py.orig
+++ ./tools/utils.py
@@ -253,7 +253,7 @@
else:
if m in ['aarch64', 'arm64', 'arm64e', 'ARM64']:
return ['arm64']
- if m in ['armv7l']:
+ if m in ['armv7l', 'armv8l']:
return ['arm']
if m in ['i386', 'i686', 'ia32', 'x86']:
return ['x86', 'ia32']

122
testing/dart/host-compiler.patch
View file

@ -1,122 +0,0 @@
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -50,15 +50,14 @@
}
gcc_toolchain("clang_arm") {
- prefix = rebased_clang_dir
- cc = "${compiler_prefix}${prefix}/clang"
- cxx = "${compiler_prefix}${prefix}/clang++"
+ cc = "clang"
+ cxx = "clang++"
- readelf = "${prefix}/llvm-readelf"
- nm = "${prefix}/llvm-nm"
- ar = "${prefix}/llvm-ar"
+ readelf = "llvm-readelf"
+ nm = "llvm-nm"
+ ar = "llvm-ar"
ld = cxx
- llvm_objcopy = "${prefix}/llvm-objcopy"
+ llvm_objcopy = "llvm-objcopy"
toolchain_cpu = "arm"
toolchain_os = "linux"
@@ -86,15 +85,14 @@
}
gcc_toolchain("clang_arm64") {
- prefix = rebased_clang_dir
- cc = "${compiler_prefix}${prefix}/clang"
- cxx = "${compiler_prefix}${prefix}/clang++"
+ cc = "clang"
+ cxx = "clang++"
readelf = "readelf"
- nm = "${prefix}/llvm-nm"
- ar = "${prefix}/llvm-ar"
+ nm = "llvm-nm"
+ ar = "llvm-ar"
ld = cxx
- llvm_objcopy = "${prefix}/llvm-objcopy"
+ llvm_objcopy = "llvm-objcopy"
toolchain_cpu = "arm64"
toolchain_os = "linux"
@@ -102,15 +100,14 @@
}
gcc_toolchain("clang_x86") {
- prefix = rebased_clang_dir
- cc = "${compiler_prefix}${prefix}/clang"
- cxx = "${compiler_prefix}${prefix}/clang++"
+ cc = "clang"
+ cxx = "clang++"
- readelf = "${prefix}/llvm-readelf"
- nm = "${prefix}/llvm-nm"
- ar = "${prefix}/llvm-ar"
- ld = cxx
- llvm_objcopy = "${prefix}/llvm-objcopy"
+ readelf = "llvm-readelf"
+ nm = "llvm-nm"
+ ar = "llvm-ar"
+ ld = "ld.lld"
+ llvm_objcopy = "llvm-objcopy"
toolchain_cpu = "x86"
toolchain_os = "linux"
@@ -134,15 +131,14 @@
}
gcc_toolchain("clang_x64") {
- prefix = rebased_clang_dir
- cc = "${compiler_prefix}${prefix}/clang"
- cxx = "${compiler_prefix}${prefix}/clang++"
+ cc = "clang"
+ cxx = "clang++"
- readelf = "${prefix}/llvm-readelf"
- nm = "${prefix}/llvm-nm"
- ar = "${prefix}/llvm-ar"
+ readelf = "llvm-readelf"
+ nm = "llvm-nm"
+ ar = "llvm-ar"
ld = cxx
- llvm_objcopy = "${prefix}/llvm-objcopy"
+ llvm_objcopy = "llvm-objcopy"
toolchain_cpu = "x64"
toolchain_os = "linux"
@@ -222,15 +218,14 @@
}
gcc_toolchain("clang_riscv64") {
- prefix = rebased_clang_dir
- cc = "${compiler_prefix}${prefix}/clang"
- cxx = "${compiler_prefix}${prefix}/clang++"
+ cc = "clang"
+ cxx = "clang++"
readelf = "readelf"
- nm = "${prefix}/llvm-nm"
- ar = "${prefix}/llvm-ar"
+ nm = "llvm-nm"
+ ar = "llvm-ar"
ld = cxx
- llvm_objcopy = "${prefix}/llvm-objcopy"
+ llvm_objcopy = "llvm-objcopy"
toolchain_cpu = "riscv64"
toolchain_os = "linux"
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -11,6 +11,8 @@
if (is_clang) {
# Don't allow visible symbols from libc++ to be re-exported.
ldflags += [ "-Wl,--exclude-libs=libc++.a" ]
+ # use lld
+ ldflags += [ "-fuse-ld=lld" ]
}
if (sysroot != "") {

19
testing/dart/look-around.patch Normal file
View file

@ -0,0 +1,19 @@
breaks dynamic zlib on armv7? 🤨
also: no static
--
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -15,10 +15,9 @@
# Explicitly use static linking for libstdc++ and libgcc to minimize
# dependencies.
- ldflags += [
- "-static-libgcc",
- "-static-libstdc++",
- ]
+
+ # look for libraries in /lib
+ ldflags += [ "-L/lib" ]
if (sysroot != "") {
cflags += [ "--sysroot=" + sysroot ]

94
testing/dart/musl-reinterpret.patch
View file

@ -1,94 +0,0 @@
--- a/runtime/vm/symbols.cc
+++ b/runtime/vm/symbols.cc
@@ -198,7 +198,7 @@
const uint8_t* utf8_array,
intptr_t array_len) {
if (array_len == 0 || utf8_array == NULL) {
- return FromLatin1(thread, reinterpret_cast<uint8_t*>(NULL), 0);
+ return FromLatin1(thread, reinterpret_cast<uint8_t*>(0), 0);
}
Utf8::Type type;
intptr_t len = Utf8::CodeUnitCount(utf8_array, array_len, &type);
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -1282,7 +1282,7 @@
if (error != NULL) {
*error = Utils::StrDup("Isolate creation failed");
}
- return reinterpret_cast<Dart_Isolate>(NULL);
+ return reinterpret_cast<Dart_Isolate>(0);
}
Thread* T = Thread::Current();
@@ -1326,7 +1326,7 @@
}
Dart::ShutdownIsolate();
- return reinterpret_cast<Dart_Isolate>(NULL);
+ return reinterpret_cast<Dart_Isolate>(0);
}
static bool IsServiceOrKernelIsolateName(const char* name) {
--- a/runtime/vm/heap/freelist_test.cc
+++ b/runtime/vm/heap/freelist_test.cc
@@ -151,7 +151,7 @@
const intptr_t kMinSize = 2 * kWordSize;
uword* objects = new uword[kBlobSize / kMinSize];
for (intptr_t i = 0; i < kBlobSize / kMinSize; ++i) {
- objects[i] = static_cast<uword>(NULL);
+ objects[i] = static_cast<uword>(0);
}
VirtualMemory* blob = VirtualMemory::Allocate(
--- a/runtime/vm/log_test.cc
+++ b/runtime/vm/log_test.cc
@@ -62,7 +62,7 @@
test_output_ = NULL;
Log* log = new Log(TestPrinter);
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
log->Print("Hello %s", "World");
EXPECT_STREQ("Hello World", test_output_);
@@ -74,23 +74,23 @@
test_output_ = NULL;
Log* log = new Log(TestPrinter);
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
{
LogBlock ba(thread, log);
log->Print("APPLE");
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
{
LogBlock ba(thread, log);
log->Print("BANANA");
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
}
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
{
LogBlock ba(thread, log);
log->Print("PEAR");
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
}
- EXPECT_EQ(reinterpret_cast<const char*>(NULL), test_output_);
+ EXPECT_EQ(reinterpret_cast<const char*>(0), test_output_);
}
EXPECT_STREQ("APPLEBANANAPEAR", test_output_);
delete log;
--- a/runtime/vm/isolate_test.cc
+++ b/runtime/vm/isolate_test.cc
@@ -17,7 +17,7 @@
Dart_Isolate isolate = TestCase::CreateTestIsolate();
EXPECT_EQ(isolate, Dart_CurrentIsolate());
Dart_ShutdownIsolate();
- EXPECT_EQ(reinterpret_cast<Dart_Isolate>(NULL), Dart_CurrentIsolate());
+ EXPECT_EQ(reinterpret_cast<Dart_Isolate>(0), Dart_CurrentIsolate());
}
// Test to ensure that an exception is thrown if no isolate creation

36
testing/dart/no-analytics.patch
View file

@ -1,22 +1,22 @@
--- a/third_party/devtools/web/index.html
+++ b/third_party/devtools/web/index.html
@@ -16,19 +16,6 @@
<title></title>
<link href="favicon.png" rel="icon" sizes="64x64">
--- ./third_party/devtools/web/index.html.orig
+++ ./third_party/devtools/web/index.html
@@ -17,19 +17,6 @@
<title></title>
<link href="favicon.png" rel="icon" sizes="64x64">
- <!-- Global site tag (gtag.js) - Google Analytics -->
- <script>
- const GA_DEVTOOLS_PROPERTY = 'UA-26406144-34'; // Dart DevTools GA Property UA.
- <!-- Global site tag (gtag.js) - Google Analytics -->
- <script>
- const GA_DEVTOOLS_PROPERTY = 'UA-26406144-34'; // Dart DevTools GA Property UA.
-
- function getDevToolsPropertyID() {
- return GA_DEVTOOLS_PROPERTY;
- }
- </script>
- <!-- The below URI ?id= must match the GA_DEVTOOLS_PROPERTY above. -->
- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-26406144-34"></script>
- <script type="text/javascript" src="devtools_analytics.js"></script>
- <!-- End of DevTools Google Analytics -->
- function getDevToolsPropertyID() {
- return GA_DEVTOOLS_PROPERTY;
- }
- </script>
- <!-- The below URI ?id= must match the GA_DEVTOOLS_PROPERTY above. -->
- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-26406144-34"></script>
- <script src="devtools_analytics.js"></script>
- <!-- End of DevTools Google Analytics -->
-
<!-- DO NOT REMOVE: -->
<!-- OBSERVER SCRIPT PLACEHOLDER -->
<!-- DO NOT REMOVE: -->
<!-- OBSERVER SCRIPT PLACEHOLDER -->

21
testing/dart/no-werror.patch
View file

@ -1,20 +1,13 @@
--- a/runtime/BUILD.gn
+++ b/runtime/BUILD.gn
@@ -190,7 +190,6 @@
}
} else {
cflags = [
- "-Werror",
"-Wall",
"-Wextra", # Also known as -W.
"-Wno-unused-parameter",
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -636,7 +636,6 @@
cflags = [
"-Wall",
@@ -672,10 +672,6 @@
"-Wextra",
- "-Werror",
]
- if (dart_sysroot != "alpine") {
- cflags += [ "-Werror" ]
- }
-
defines = []
if (!using_sanitizer && !is_clang) {
# _FORTIFY_SOURCE isn't really supported by Clang now, see

13
testing/dart/toolhack.patch
View file

@ -1,13 +0,0 @@
this breaks the default clang include dir
diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn
index 6b941f0..e465e37 100644
--- a/build/config/gcc/BUILD.gn
+++ b/build/config/gcc/BUILD.gn
@@ -75,6 +75,6 @@ config("relative_paths") {
# prefix matching absolute_path and hence be mapped to relative_path
# in the debugging information, so this should actually be
# superfluous for purposes of the debugging information.
- "-no-canonical-prefixes",
+ #"-no-canonical-prefixes",
]
}

12
testing/dart/use-lld.patch Normal file
View file

@ -0,0 +1,12 @@
--- ./build/config/linux/BUILD.gn.orig
+++ ./build/config/linux/BUILD.gn
@@ -13,6 +13,9 @@
ldflags += [ "-Wl,--exclude-libs=libc++.a" ]
}
+ # use lld
+ ldflags += [ "-fuse-ld=lld" ]
+
# Explicitly use static linking for libstdc++ and libgcc to minimize
# dependencies.
ldflags += [

30
testing/dart/where-we-are-heading-prefixes-are-not-needed.patch Normal file
View file

@ -0,0 +1,30 @@
binutils doesn't have them prefixes
--- ./build/toolchain/linux/BUILD.gn.orig
+++ ./build/toolchain/linux/BUILD.gn
@@ -33,7 +33,7 @@
}
gcc_toolchain("arm") {
- prefix = "arm-linux-gnueabihf-"
+ prefix = ""
if (toolchain_prefix != "") {
prefix = toolchain_prefix
}
@@ -69,7 +69,7 @@
}
gcc_toolchain("arm64") {
- prefix = "aarch64-linux-gnu-"
+ prefix = ""
if (toolchain_prefix != "") {
prefix = toolchain_prefix
}
@@ -205,7 +205,7 @@
}
gcc_toolchain("riscv64") {
- prefix = "riscv64-linux-gnu-"
+ prefix = ""
if (toolchain_prefix != "") {
prefix = toolchain_prefix
}