Browse Source

Merge pull request #4824 from zorro/master

dart: update to 2.7.0
build-on-device
Leonid Plyushch 5 years ago
committed by GitHub
parent
commit
c4f5d8fc4a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      packages/dart/build.sh
  2. 24
      packages/dart/fix-shell-path.patch

3
packages/dart/build.sh

@ -1,8 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.dartlang.org/
TERMUX_PKG_DESCRIPTION="Dart is a general-purpose programming language"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=2.4.1
TERMUX_PKG_VERSION=2.7.0
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
# Dart uses tar and gzip to extract downloaded packages.
# Busybox-based versions of such utilities cause issues so

24
packages/dart/fix-shell-path.patch

@ -19,27 +19,3 @@ diff -uNr src/sdk/pkg/front_end/lib/src/api_prototype/terminal_color_support.dar
if (result.exitCode != 0) {
if (debug) {
diff -uNr src/sdk/pkg/front_end/lib/src/fasta/colors.dart src.mod/sdk/pkg/front_end/lib/src/fasta/colors.dart
--- src/sdk/pkg/front_end/lib/src/fasta/colors.dart 2019-05-22 18:59:58.267004322 +0000
+++ src.mod/sdk/pkg/front_end/lib/src/fasta/colors.dart 2019-05-22 19:19:14.722850300 +0000
@@ -154,7 +154,7 @@
// The `-S` option of `tput` allows us to query multiple capabilities at
// once.
ProcessResult result = Process.runSync(
- "/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
+ "@TERMUX_PREFIX@/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
if (result.exitCode != 0) {
if (context.options.verbose) {
diff -uNr src/sdk/runtime/bin/process_patch.dart src.mod/sdk/runtime/bin/process_patch.dart
--- src/sdk/runtime/bin/process_patch.dart 2019-05-22 18:59:58.641006510 +0000
+++ src.mod/sdk/runtime/bin/process_patch.dart 2019-05-22 19:15:52.594173281 +0000
@@ -321,7 +321,7 @@
if (Platform.isWindows) {
return 'cmd.exe';
}
- return '/bin/sh';
+ return '@TERMUX_PREFIX@/bin/sh';
}
static List<String> _getShellArguments(

Loading…
Cancel
Save