aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/mrustc/patches/0001-use-shared-llvm.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/rustc-1.29.0-src/src/librustc_llvm/lib.rs
--- b/rustc-1.29.0-src/src/librustc_llvm/lib.rs
@@ -23,6 +23,9 @@
#![feature(link_args)]
#![feature(static_nobundle)]
+// https://github.com/rust-lang/rust/issues/34486
+#[link(name = "ffi")] extern {}
+
// See librustc_cratesio_shim/Cargo.toml for a comment explaining this.
#[allow(unused_extern_crates)]
extern crate rustc_cratesio_shim;

14
pkgs/development/compilers/mrustc/patches/0002-dont-build-llvm.patch Normal file
View file

@ -0,0 +1,14 @@
--- a/minicargo.mk
+++ b/minicargo.mk
@@ -116,11 +116,6 @@
LLVM_CMAKE_OPTS += CMAKE_BUILD_TYPE=RelWithDebInfo
-$(LLVM_CONFIG): $(RUSTCSRC)build/Makefile
- $Vcd $(RUSTCSRC)build && $(MAKE)
-$(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt
- @mkdir -p $(RUSTCSRC)build
- $Vcd $(RUSTCSRC)build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../src/llvm
#

13
pkgs/development/compilers/mrustc/patches/0003-echo-newlines.patch Normal file
View file

@ -0,0 +1,13 @@
--- a/run_rustc/Makefile
+++ b/run_rustc/Makefile
@@ -103,7 +103,9 @@
else
cp $(OUTDIR)build-rustc/release/rustc_binary $(BINDIR)rustc_binary
endif
- echo '#!/bin/sh\nd=$$(dirname $$0)\nLD_LIBRARY_PATH="$(abspath $(LIBDIR))" $$d/rustc_binary $$@' >$@
+ echo '#!$(shell which bash)' > $@
+ echo 'd=$$(dirname $$0)' >> $@
+ echo 'LD_LIBRARY_PATH="$(abspath $(LIBDIR))" $$d/rustc_binary $$@' >> $@
chmod +x $@
$(BINDIR)hello_world: $(RUST_SRC)test/run-pass/hello.rs $(LIBDIR)libstd.rlib $(BINDIR)rustc

28
pkgs/development/compilers/mrustc/patches/0004-increase-parallelism.patch Normal file
View file

@ -0,0 +1,28 @@
--- a/run_rustc/Makefile
+++ b/run_rustc/Makefile
@@ -79,14 +79,14 @@
@mkdir -p $(OUTDIR)build-std
@mkdir -p $(LIBDIR)
@echo [CARGO] $(RUST_SRC)libstd/Cargo.toml
- $VCARGO_TARGET_DIR=$(OUTDIR)build-std RUSTC=$(BINDIR_S)rustc $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libstd/Cargo.toml -j 1 --release --features panic-unwind
+ $VCARGO_TARGET_DIR=$(OUTDIR)build-std RUSTC=$(BINDIR_S)rustc $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libstd/Cargo.toml -j $(NIX_BUILD_CORES) --release --features panic-unwind
$Vcp --remove-destination $(OUTDIR)build-std/release/deps/*.rlib $(LIBDIR)
$Vcp --remove-destination $(OUTDIR)build-std/release/deps/*.so $(LIBDIR)
# libtest
$(LIBDIR)libtest.rlib: $(BINDIR)rustc_m $(LIBDIR)libstd.rlib $(CARGO_HOME)config
@mkdir -p $(OUTDIR)build-test
@echo [CARGO] $(RUST_SRC)libtest/Cargo.toml
- $VCARGO_TARGET_DIR=$(OUTDIR)build-test RUSTC=$(BINDIR)rustc_m $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libtest/Cargo.toml -j 1 --release
+ $VCARGO_TARGET_DIR=$(OUTDIR)build-test RUSTC=$(BINDIR)rustc_m $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libtest/Cargo.toml -j $(NIX_BUILD_CORES) --release
@mkdir -p $(LIBDIR)
$Vcp --remove-destination $(OUTDIR)build-test/release/deps/*.rlib $(LIBDIR)
$Vcp --remove-destination $(OUTDIR)build-test/release/deps/*.so $(LIBDIR)
@@ -95,7 +95,7 @@
$(BINDIR)rustc: $(BINDIR)rustc_m $(BINDIR)cargo $(CARGO_HOME)config $(LIBDIR)libtest.rlib
@mkdir -p $(PREFIX)tmp
@echo [CARGO] $(RUST_SRC)rustc/Cargo.toml
- $V$(RUSTC_ENV_VARS) TMPDIR=$(abspath $(PREFIX)tmp) CARGO_TARGET_DIR=$(OUTDIR)build-rustc RUSTC=$(BINDIR)rustc_m RUSTC_ERROR_METADATA_DST=$(abspath $(PREFIX)) $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)rustc/Cargo.toml --release -j 1
+ $V$(RUSTC_ENV_VARS) TMPDIR=$(abspath $(PREFIX)tmp) CARGO_TARGET_DIR=$(OUTDIR)build-rustc RUSTC=$(BINDIR)rustc_m RUSTC_ERROR_METADATA_DST=$(abspath $(PREFIX)) $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)rustc/Cargo.toml --release -j $(NIX_BUILD_CORES)
cp $(OUTDIR)build-rustc/release/deps/*.so $(LIBDIR)
cp $(OUTDIR)build-rustc/release/deps/*.rlib $(LIBDIR)
ifeq ($(RUSTC_VERSION),1.19.0)