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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
43
pkgs/development/compilers/obliv-c/default.nix
Normal file
43
pkgs/development/compilers/obliv-c/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obliv-c";
|
||||
version = "0.0pre20210621";
|
||||
buildInputs = [ perl ]
|
||||
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
|
||||
propagatedBuildInputs = [ libgcrypt ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "samee";
|
||||
repo = "obliv-c";
|
||||
rev = "e02e5c590523ef4dae06e167a7fa00037bb3fdaf";
|
||||
sha256 = "sha256:02vyr4689f4dmwqqs0q1mrack9h3g8jz3pj8zqiz987dk0r5mz7a";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
patches = [ ./ignore-complex-float128.patch ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp bin/* "$out/bin"
|
||||
mkdir -p "$out/share/doc/obliv-c"
|
||||
cp -r doc/* README* CHANGE* Change* LICEN* TODO* "$out/share/doc/obliv-c"
|
||||
mkdir -p "$out/share/obliv-c"
|
||||
cp -r test "$out/share/obliv-c"
|
||||
mkdir -p "$out/include"
|
||||
cp src/ext/oblivc/*.h "$out/include"
|
||||
mkdir -p "$out/lib"
|
||||
gcc $(ar t _build/libobliv.a | sed -e 's@^@_build/@') --shared -o _build/libobliv.so
|
||||
cp _build/lib*.a _build/lib*.so* "$out/lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
--- a/src/frontc/clexer.mll
|
||||
+++ b/src/frontc/clexer.mll
|
||||
@@ -134,9 +134,11 @@ let init_lexicon _ =
|
||||
(* WW: see /usr/include/sys/cdefs.h for why __signed and __volatile
|
||||
* are accepted GCC-isms *)
|
||||
("_Bool", fun loc -> BOOL loc);
|
||||
+ ("_Complex", fun loc -> COMPLEX loc);
|
||||
("char", fun loc -> CHAR loc);
|
||||
("int", fun loc -> INT loc);
|
||||
("float", fun loc -> FLOAT loc);
|
||||
+ ("__float128", fun loc -> FLOAT128 loc);
|
||||
("double", fun loc -> DOUBLE loc);
|
||||
("void", fun loc -> VOID loc);
|
||||
("enum", fun loc -> ENUM loc);
|
||||
--- a/src/frontc/cparser.mly
|
||||
+++ b/src/frontc/cparser.mly
|
||||
@@ -269,6 +269,8 @@ let oblivState (s:statement): statement =
|
||||
%token<Cabs.cabsloc> VOLATILE EXTERN STATIC CONST RESTRICT AUTO REGISTER FROZEN
|
||||
%token<Cabs.cabsloc> THREAD
|
||||
|
||||
+%token<Cabs.cabsloc> COMPLEX FLOAT128
|
||||
+
|
||||
%token<Cabs.cabsloc> SIZEOF ALIGNOF
|
||||
|
||||
%token EQ PLUS_EQ MINUS_EQ STAR_EQ SLASH_EQ PERCENT_EQ
|
||||
@@ -1002,7 +1004,11 @@ type_spec: /* ISO 6.7.2 */
|
||||
| LONG { Tlong, $1 }
|
||||
| INT64 { Tint64, $1 }
|
||||
| FLOAT { Tfloat, $1 }
|
||||
+| FLOAT128 { Tfloat, $1 }
|
||||
| DOUBLE { Tdouble, $1 }
|
||||
+| COMPLEX FLOAT { Tfloat, $2 }
|
||||
+| COMPLEX FLOAT128{ Tfloat, $2 }
|
||||
+| COMPLEX DOUBLE { Tdouble, $2 }
|
||||
| SIGNED { Tsigned, $1 }
|
||||
| UNSIGNED { Tunsigned, $1 }
|
||||
| STRUCT id_or_typename
|
||||
Loading…
Add table
Add a link
Reference in a new issue