sparse: 0.5.0 -> 0.6.3 and fixes

Added sqlite and gtk+3 that are now wanted by sparse.

Sparse expects to find system includes at /usr/include redirect this
to glibc.dev.

Sparse uses gcc -print-file-name= extensively to find gcc includes, due
to split in nixos this direct to gcc-lib, which does not include the headers
so redirect to GCC_BASE as defined in derivation. There might be a better way
to do this, but I did not immediately find one.

Define PREFIX as Make parameter, as old sed expression was broken.

Add a trivial test for cgcc.

Slightly irrelevant ref.
https://bugzilla.redhat.com/show_bug.cgi?id=1114755
This commit is contained in:
Emil Karlson 2021-08-18 14:09:49 +03:00 committed by Artturin
parent b98dc16457
commit 883874f513
2 changed files with 43 additions and 10 deletions

View file

@ -1,27 +1,36 @@
{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm, perl }:
{ callPackage, fetchurl, lib, stdenv, gtk3, pkg-config, libxml2, llvm, perl, sqlite }:
stdenv.mkDerivation rec {
let
GCC_BASE = "${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.uname.processor}-unknown-linux-gnu/${stdenv.cc.cc.version}";
in stdenv.mkDerivation rec {
pname = "sparse";
version = "0.5.0";
version = "0.6.3";
src = fetchurl {
url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz";
sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj";
sha256 = "16d8c4dhipjzjf8z4z7pix1pdpqydz0v4r7i345f5s09hjnxpxnl";
};
preConfigure = ''
sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
sed -i 's|"/usr/include"|"${stdenv.cc.libc.dev}/include"|' pre-process.c
sed -i 's|qx(\$ccom -print-file-name=)|"${GCC_BASE}"|' cgcc
makeFlags+=" PREFIX=$out"
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 llvm perl ];
buildInputs = [ gtk3 libxml2 llvm perl sqlite ];
doCheck = true;
buildFlags = "GCC_BASE:=${GCC_BASE}";
meta = {
passthru.tests = {
simple-execution = callPackage ./tests.nix { };
};
meta = with lib; {
description = "Semantic parser for C";
homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.thoughtpolice ];
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice jkarlson ];
};
}

View file

@ -0,0 +1,24 @@
{ runCommand, gcc, sparse, writeText }:
let
src = writeText "CODE.c" ''
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
int main(int argc, char *argv[]) {
return EXIT_SUCCESS;
}
'';
in
runCommand "${sparse.pname}-tests" { buildInputs = [ gcc sparse ]; meta.timeout = 3; }
''
set -eu
${sparse}/bin/cgcc ${src} > output 2>&1 || ret=$?
if [[ -z $(<output) ]]; then
mv output $out
else
echo "Test build returned $ret"
cat output
exit 1
fi
''