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
101
pkgs/development/compilers/ecl/16.1.2.nix
Normal file
101
pkgs/development/compilers/ecl/16.1.2.nix
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
, gmp
|
||||
, mpfr
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, noUnicode ? false
|
||||
, gcc
|
||||
, threadSupport ? false
|
||||
, useBoehmgc ? true
|
||||
, boehmgc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ecl";
|
||||
version = "16.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
|
||||
sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
buildInputs = [
|
||||
libtool
|
||||
makeWrapper
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libffi
|
||||
gmp
|
||||
mpfr
|
||||
gcc
|
||||
] ++ lib.optionals useBoehmgc [
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
boehmgc
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(if threadSupport then "--enable-threads" else "--disable-threads")
|
||||
"--with-gmp-incdir=${lib.getDev gmp}/include"
|
||||
"--with-gmp-libdir=${lib.getLib gmp}/lib"
|
||||
# -incdir, -libdir doesn't seem to be supported for libffi
|
||||
"--with-libffi-prefix=${lib.getDev libffi}"
|
||||
] ++ lib.optional (! noUnicode) "--enable-unicode"
|
||||
;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Avoid infinite loop, see https://gitlab.com/embeddable-common-lisp/ecl/issues/43 (fixed upstream)
|
||||
name = "avoid-infinite-loop.patch";
|
||||
url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
|
||||
sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fix getcwd with long pathnames
|
||||
# Rebased version of
|
||||
# https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch
|
||||
name = "getcwd.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
|
||||
})
|
||||
./ecl-1.16.2-libffi-3.3-abi.patch
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
|
||||
wrapProgram "$out/bin/ecl" \
|
||||
--prefix PATH ':' "${
|
||||
lib.makeBinPath [
|
||||
gcc # for the C compiler
|
||||
gcc.bintools.bintools # for ar
|
||||
]
|
||||
}" \
|
||||
''
|
||||
# ecl 16.1.2 is too old to have -libdir for libffi and boehmgc, so we need to
|
||||
# use NIX_LDFLAGS_BEFORE to make gcc find these particular libraries.
|
||||
# Since it is missing even the prefix flag for boehmgc we also need to inject
|
||||
# the correct -I flag via NIX_CFLAGS_COMPILE. Since we have access to it, we
|
||||
# create the variables with suffixSalt (which seems to be necessary for
|
||||
# NIX_CFLAGS_COMPILE even).
|
||||
+ lib.optionalString useBoehmgc ''
|
||||
--prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \
|
||||
'' + ''
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
86
pkgs/development/compilers/ecl/default.nix
Normal file
86
pkgs/development/compilers/ecl/default.nix
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
, texinfo
|
||||
, gmp
|
||||
, mpfr
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, noUnicode ? false
|
||||
, gcc
|
||||
, threadSupport ? true
|
||||
, useBoehmgc ? false
|
||||
, boehmgc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ecl";
|
||||
version = "21.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
|
||||
sha256 = "sha256-sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
texinfo
|
||||
makeWrapper
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libffi
|
||||
gmp
|
||||
mpfr
|
||||
gcc
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
] ++ lib.optionals useBoehmgc [
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
boehmgc
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2";
|
||||
sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(if threadSupport then "--enable-threads" else "--disable-threads")
|
||||
"--with-gmp-incdir=${lib.getDev gmp}/include"
|
||||
"--with-gmp-libdir=${lib.getLib gmp}/lib"
|
||||
"--with-libffi-incdir=${lib.getDev libffi}/include"
|
||||
"--with-libffi-libdir=${lib.getLib libffi}/lib"
|
||||
] ++ lib.optionals useBoehmgc [
|
||||
"--with-libgc-incdir=${lib.getDev boehmgc}/include"
|
||||
"--with-libgc-libdir=${lib.getLib boehmgc}/lib"
|
||||
] ++ lib.optional (!noUnicode) "--enable-unicode";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
|
||||
wrapProgram "$out/bin/ecl" --prefix PATH ':' "${
|
||||
lib.makeBinPath [
|
||||
gcc # for the C compiler
|
||||
gcc.bintools.bintools # for ar
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
homepage = "https://common-lisp.net/project/ecl/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${version}/CHANGELOG";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/c/ffi.d b/src/c/ffi.d
|
||||
index 8861303e..8a959c23 100644
|
||||
--- a/src/c/ffi.d
|
||||
+++ b/src/c/ffi.d
|
||||
@@ -145,8 +145,8 @@ static struct {
|
||||
#elif defined(X86_WIN64)
|
||||
{@':win64', FFI_WIN64},
|
||||
#elif defined(X86_ANY) || defined(X86) || defined(X86_64)
|
||||
- {@':cdecl', FFI_SYSV},
|
||||
- {@':sysv', FFI_SYSV},
|
||||
+ {@':cdecl', FFI_UNIX64},
|
||||
+ {@':sysv', FFI_UNIX64},
|
||||
{@':unix64', FFI_UNIX64},
|
||||
#endif
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue