mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-25 11:22:30 +01:00
138 lines
4.5 KiB
Plaintext
138 lines
4.5 KiB
Plaintext
--- ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/target.dart.orig
|
|
+++ ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/target.dart
|
|
@@ -47,11 +47,11 @@
|
|
flutter: 'windows-x64',
|
|
),
|
|
Target(
|
|
- rust: 'x86_64-unknown-linux-gnu',
|
|
+ rust: 'x86_64-alpine-linux-musl',
|
|
flutter: 'linux-x64',
|
|
),
|
|
Target(
|
|
- rust: 'aarch64-unknown-linux-gnu',
|
|
+ rust: 'aarch64-alpine-linux-musl',
|
|
flutter: 'linux-arm64',
|
|
),
|
|
Target(
|
|
@@ -111,9 +111,9 @@
|
|
// the host target.
|
|
final arch = runCommand('arch', []).stdout as String;
|
|
if (arch.trim() == 'aarch64') {
|
|
- return [Target.forRustTriple('aarch64-unknown-linux-gnu')!];
|
|
+ return [Target.forRustTriple('aarch64-alpine-linux-musl')!];
|
|
} else {
|
|
- return [Target.forRustTriple('x86_64-unknown-linux-gnu')!];
|
|
+ return [Target.forRustTriple('x86_64-alpine-linux-musl')!];
|
|
}
|
|
}
|
|
return all.where((target) {
|
|
--- ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/rustup.dart.orig
|
|
+++ ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/rustup.dart
|
|
@@ -26,7 +26,6 @@
|
|
|
|
void installToolchain(String toolchain) {
|
|
log.info("Installing Rust toolchain: $toolchain");
|
|
- runCommand("rustup", ['toolchain', 'install', toolchain]);
|
|
_installedToolchains
|
|
.add(_Toolchain(toolchain, _getInstalledTargets(toolchain)));
|
|
}
|
|
@@ -36,13 +35,6 @@
|
|
required String toolchain,
|
|
}) {
|
|
log.info("Installing Rust target: $target");
|
|
- runCommand("rustup", [
|
|
- 'target',
|
|
- 'add',
|
|
- '--toolchain',
|
|
- toolchain,
|
|
- target,
|
|
- ]);
|
|
_installedTargets(toolchain)?.add(target);
|
|
}
|
|
|
|
@@ -62,13 +54,10 @@
|
|
return parts[0];
|
|
}
|
|
|
|
- final res = runCommand("rustup", ['toolchain', 'list']);
|
|
-
|
|
// To list all non-custom toolchains, we need to filter out lines that
|
|
// don't start with "stable", "beta", or "nightly".
|
|
Pattern nonCustom = RegExp(r"^(stable|beta|nightly)");
|
|
- final lines = res.stdout
|
|
- .toString()
|
|
+ final lines = "stable-${Platform.environment['CTARGET']!}"
|
|
.split('\n')
|
|
.where((e) => e.isNotEmpty && e.startsWith(nonCustom))
|
|
.map(extractToolchainName)
|
|
@@ -85,15 +74,7 @@
|
|
}
|
|
|
|
static List<String> _getInstalledTargets(String toolchain) {
|
|
- final res = runCommand("rustup", [
|
|
- 'target',
|
|
- 'list',
|
|
- '--toolchain',
|
|
- toolchain,
|
|
- '--installed',
|
|
- ]);
|
|
- final lines = res.stdout
|
|
- .toString()
|
|
+ final lines = Platform.environment['CTARGET']!
|
|
.split('\n')
|
|
.where((e) => e.isNotEmpty)
|
|
.toList(growable: true);
|
|
@@ -107,14 +88,11 @@
|
|
return;
|
|
}
|
|
// Useful for -Z build-std
|
|
- runCommand(
|
|
- "rustup",
|
|
- ['component', 'add', 'rust-src', '--toolchain', 'nightly'],
|
|
- );
|
|
_didInstallRustSrcForNightly = true;
|
|
}
|
|
|
|
static String? executablePath() {
|
|
+ return null;
|
|
final envPath = Platform.environment['PATH'];
|
|
final envPathSeparator = Platform.isWindows ? ';' : ':';
|
|
final home = Platform.isWindows
|
|
--- ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/util.dart.orig
|
|
+++ ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/util.dart
|
|
@@ -160,6 +160,7 @@
|
|
}
|
|
|
|
String _resolveExecutable(String executable) {
|
|
+ return executable;
|
|
if (executable == 'rustup') {
|
|
final resolved = Rustup.executablePath();
|
|
if (resolved != null) {
|
|
--- ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/options.dart.orig
|
|
+++ ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/options.dart
|
|
@@ -234,7 +234,7 @@
|
|
// When Rustup is installed always build locally unless user opts into
|
|
// using precompiled binaries.
|
|
static bool defaultUsePrecompiledBinaries() {
|
|
- return Rustup.executablePath() == null;
|
|
+ return false;
|
|
}
|
|
|
|
CargokitUserOptions({
|
|
--- ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/builder.dart.orig
|
|
+++ ./pub_cache/hosted/pub.dev/flutter_vodozemac-0.2.2/cargokit/build_tool/lib/src/builder.dart
|
|
@@ -140,11 +140,9 @@
|
|
final extraArgs = _buildOptions?.flags ?? [];
|
|
final manifestPath = path.join(environment.manifestDir, 'Cargo.toml');
|
|
runCommand(
|
|
- 'rustup',
|
|
+ 'cargo',
|
|
[
|
|
- 'run',
|
|
- _toolchain,
|
|
- 'cargo',
|
|
+ 'auditable',
|
|
'build',
|
|
...extraArgs,
|
|
'--manifest-path',
|