diff --git a/testing/dart/APKBUILD b/testing/dart/APKBUILD index c489f508e5e..132ac07ef02 100644 --- a/testing/dart/APKBUILD +++ b/testing/dart/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: lauren n. liberda pkgname=dart # upgrade checklist: https://md.sdomi.pl/Q-ECZTJ2Qqyp3ahfJuYSBw -pkgver=3.6.0 +pkgver=3.7.0 pkgrel=0 -_bootstrap=3.6.0_alpha2_p0 +_bootstrap=3.7.0_alpha232_p0 pkgdesc="Dart is a client-optimized language for fast apps on any platform" url="https://dart.dev/" arch="aarch64 armv7 x86_64" @@ -51,7 +51,6 @@ source=" unbundle-icu.patch where-we-are-heading-prefixes-are-not-needed.patch zlib-not-found.patch - boringssl-gcc14.patch " builddir="$srcdir/dart-sdk-$_canonver" @@ -213,7 +212,7 @@ sdk() { _snapshots=" analysis_server - dart2js + dart2js_aot dartdevc gen_kernel_aot kernel-service @@ -230,14 +229,13 @@ sdk() { } sha512sums=" -80fbe8a1bacafcee331c0a60f0a0cbc738ee3e17b3bbf9868154e4f2515d9701d1ba48d8150dc4392d3661ad249cd282e87d3aa2d52f73d6c34a88d1725382fa dart-sdk-3.6.0.tar.zst +d2627db601792add10724a7621c09305c6d83f53ea6424cb3396a2040c07591bf0d3960fb1d7cceda45fe897719ebc8addb06d5d8fed06dc7936c30e8c543569 dart-sdk-3.7.0.tar.zst 0b0980bc0b699de97e76addf6676e22c8f9544936e36903131b40f34fb915467e80e959c410ddb4519a001814c16d19af9eaaed5fd8fcb795d7bfe9e6d9df661 dart-wrapper.sh 3ae8364a172b029cf0b45cd4fd1ac192a20772c84924bb59a1775339ed6314cf81c398b078823fd9f07abc1b0de4b5704c76ce84c64f8924e645f00cfcda4ff3 build-config.patch 03562a3fa935b6819458acdfcadf24f71accf73e2000d158c1fe41aca068b21fb158350a32911c322672b592beefea1e9c7e4675a98418804e60000049a656c8 gcc13.patch e7f5c715d9ed01c36e8b60892332b1bc763a3f98ca87905e2102491c469db60ab21dba9b3e116e1a7ec3faef7d65b8fdd60d7148cfb848ef5a2b411a06f425cf no-werror.patch 14b6b024688110631dfce6d51b895e84d4306a00e66c0e5306126f6d27cbd13894bf2c50faffab99e57107901ec3977a4b0038bee9e165f733ef9e4ccc14af1a unbundle.patch -bceba58975e827995344bb417e830201ffc809851869629758fc3d2162cf9d94c4c0a99413b1ec7b8cf52eb61646ceab40de9fc9417b5a6c162a6c7a855850cf unbundle-icu.patch -c73ca1993fab3696563a0ac6a95010da507cc774bdbf2489d71dd7a69959ec166e88e05a199cd5727225b7165aeb44561887f24c8d328953fde1c262fbafd862 where-we-are-heading-prefixes-are-not-needed.patch +04478a0927c4f1c316346fc0e53386a841493b1e5c7facb4e2a2fffd11b5110a3779bca8bc5a33510964d320f24e883b6afc653c48849380c5b9097611a3eb55 unbundle-icu.patch +797fc5b436c9cf6e39221c24681993e013a8ea88a4207e1a44c9185a6e4aec58b2ba548d563d93ddd6122500dcf9a7436a16db44085f057d516cc9e465b554d8 where-we-are-heading-prefixes-are-not-needed.patch 460eedf708e8093e0484e3d13fc61d891f4b3c1f8c8595c962410550ef988773aea87173e3fe60626a687dcacbc7e3c531d811bbd96a8856a0c1694d5c53e4b0 zlib-not-found.patch -5a893fccb8dbaa8b33989d6d86b65cefb9af2bd09a3c29d7a0859033833bee84baf2a6faab33d16b727893ec60575a04635a9753b570f946028a6ea3e3dd170c boringssl-gcc14.patch " diff --git a/testing/dart/boringssl-gcc14.patch b/testing/dart/boringssl-gcc14.patch deleted file mode 100644 index cfdac04f748..00000000000 --- a/testing/dart/boringssl-gcc14.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch-Source: https://github.com/google/boringssl/commit/c70190368c7040c37c1d655f0690bcde2b109a0d - -From c70190368c7040c37c1d655f0690bcde2b109a0d Mon Sep 17 00:00:00 2001 -From: David Benjamin -Date: Thu, 16 May 2024 11:00:42 -0400 -Subject: [PATCH] Don't define CRYPTO_addc_* and CRYPTO_subc_* in C++ - -GCC does not support C11 _Generic in C++ mode. - -Change-Id: I974a0b04bbe4900419736044d0d8050f2b856d56 -Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/68507 -Auto-Submit: David Benjamin -Commit-Queue: David Benjamin -Reviewed-by: Adam Langley ---- - crypto/internal.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/third_party/boringssl/src/crypto/internal.h b/third_party/boringssl/src/crypto/internal.h -index a77102d766..a45f97bcc9 100644 ---- a/third_party/boringssl/src/crypto/internal.h -+++ b/third_party/boringssl/src/crypto/internal.h -@@ -1174,6 +1174,11 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) { - - // Arithmetic functions. - -+// The most efficient versions of these functions on GCC and Clang depend on C11 -+// |_Generic|. If we ever need to call these from C++, we'll need to add a -+// variant that uses C++ overloads instead. -+#if !defined(__cplusplus) -+ - // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry - // bit. |carry| must be zero or one. - #if OPENSSL_HAS_BUILTIN(__builtin_addc) -@@ -1275,6 +1280,8 @@ static inline uint64_t CRYPTO_subc_u64(uint64_t x, uint64_t y, uint64_t borrow, - #define CRYPTO_subc_w CRYPTO_subc_u32 - #endif - -+#endif // !__cplusplus -+ - - // FIPS functions. - diff --git a/testing/dart/unbundle-icu.patch b/testing/dart/unbundle-icu.patch index 66438149163..80e26913958 100644 --- a/testing/dart/unbundle-icu.patch +++ b/testing/dart/unbundle-icu.patch @@ -39,8 +39,8 @@ index 90dc09a0c02..8f88873dc18 100644 ] extra_deps = [ - ":icudtl_cc", - "..:libdart_precompiled_runtime", - "../platform:libdart_platform_precompiled_runtime", + "..:libdart_aotruntime", + "../platform:libdart_platform_aotruntime", ] + if (dart_embed_icu_data) { + extra_deps += [ ":icudtl_cc" ] diff --git a/testing/dart/where-we-are-heading-prefixes-are-not-needed.patch b/testing/dart/where-we-are-heading-prefixes-are-not-needed.patch index 49373af8bef..426b79f6013 100644 --- a/testing/dart/where-we-are-heading-prefixes-are-not-needed.patch +++ b/testing/dart/where-we-are-heading-prefixes-are-not-needed.patch @@ -1,36 +1,45 @@ --- ./build/toolchain/linux/BUILD.gn.orig +++ ./build/toolchain/linux/BUILD.gn -@@ -55,7 +55,7 @@ +@@ -63,7 +63,7 @@ } - gcc_toolchain("arm") { + gcc_toolchain_suite("arm") { - prefix = "arm-linux-gnueabihf-" + prefix = "" if (arm_toolchain_prefix != "") { prefix = arm_toolchain_prefix } -@@ -98,7 +98,7 @@ +@@ -106,7 +106,7 @@ } - gcc_toolchain("arm64") { + gcc_toolchain_suite("arm64") { - prefix = "aarch64-linux-gnu-" + prefix = "" if (arm64_toolchain_prefix != "") { prefix = arm64_toolchain_prefix } -@@ -205,7 +205,7 @@ +@@ -171,7 +171,7 @@ } - gcc_toolchain("x64") { + gcc_toolchain_suite("x86") { +- prefix = "i686-linux-gnu-" ++ prefix = "" + if (ia32_toolchain_prefix != "") { + prefix = ia32_toolchain_prefix + } +@@ -213,7 +213,7 @@ + } + + gcc_toolchain_suite("x64") { - prefix = "x86_64-linux-gnu-" + prefix = "" if (x64_toolchain_prefix != "") { prefix = x64_toolchain_prefix } -@@ -268,7 +268,7 @@ +@@ -276,7 +276,7 @@ } - gcc_toolchain("riscv64") { + gcc_toolchain_suite("riscv64") { - prefix = "riscv64-linux-gnu-" + prefix = "" if (riscv64_toolchain_prefix != "") {