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

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

View file

@ -0,0 +1,50 @@
diff --git a/appl_grid/appl_grid.h b/appl_grid/appl_grid.h
index 5059622..a0651c9 100644
--- a/appl_grid/appl_grid.h
+++ b/appl_grid/appl_grid.h
@@ -56,7 +56,7 @@ public:
class exception : public std::exception {
public:
exception(const std::string& s) { std::cerr << what() << " " << s << std::endl; };
- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
+ exception(std::ostream& s) { s << what() << " " << std::endl; };
virtual const char* what() const throw() { return "appl::grid::exception"; }
};
diff --git a/appl_grid/appl_pdf.h b/appl_grid/appl_pdf.h
index c71fd84..2525527 100644
--- a/appl_grid/appl_pdf.h
+++ b/appl_grid/appl_pdf.h
@@ -51,7 +51,7 @@ public:
class exception : public std::exception {
public:
exception(const std::string& s="") { std::cerr << what() << " " << s << std::endl; };
- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
+ exception(std::ostream& s) { s << " " << std::endl; };
const char* what() const throw() { return "appl::appl_pdf::exception "; }
};
diff --git a/src/appl_igrid.h b/src/appl_igrid.h
index d25288e..be354df 100644
--- a/src/appl_igrid.h
+++ b/src/appl_igrid.h
@@ -52,7 +52,7 @@ private:
class exception {
public:
exception(const std::string& s) { std::cerr << s << std::endl; };
- exception(std::ostream& s) { std::cerr << s << std::endl; };
+ exception(std::ostream& s) { s << std::endl; };
};
typedef double (igrid::*transform_t)(double) const;
diff --git a/src/lumi_pdf.cxx b/src/lumi_pdf.cxx
--- a/src/lumi_pdf.cxx
+++ b/src/lumi_pdf.cxx
@@ -235,6 +235,6 @@ void lumi_pdf::write(const std::string& filename) const {
// std::string lumi_pdf::summary(std::ostream& s=std::cout) const {
std::string lumi_pdf::summary() const {
std::stringstream s;
- s << "lumi_pdf::lumi_pdf() " << s << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
+ s << "lumi_pdf::lumi_pdf() " << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
return s.str();
}

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
stdenv.mkDerivation rec {
pname = "applgrid";
version = "1.4.70";
src = fetchurl {
url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
};
nativeBuildInputs = [ gfortran ];
# For some reason zlib was only needed after bump to gfortran8
buildInputs = [ hoppet lhapdf root5 zlib ];
patches = [
./bad_code.patch
];
preConfigure = ''
substituteInPlace src/Makefile.in \
--replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
'' + (if stdenv.isDarwin then ''
substituteInPlace src/Makefile.in \
--replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
'' else "");
enableParallelBuilding = false; # broken
# Install private headers required by APFELgrid
postInstall = ''
for header in src/*.h; do
install -Dm644 "$header" "$out"/include/appl_grid/"`basename $header`"
done
'';
meta = with lib; {
description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics";
license = licenses.gpl3;
homepage = "http://applgrid.hepforge.org";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}