mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
daa9d5edca
glibc 2.24 deprecated readdir_r, breaking the perf build:
$ nix-build -A linuxPackages.perf
...
CC util/event.o
CC util/evlist.o
util/event.c: In function '__event__synthesize_thread':
util/event.c:448:2: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations]
while (!readdir_r(tasks, &dirent, &next) && next) {
^
In file included from /nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/features.h:368:0,
from /nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/stdint.h:25,
from /nix/store/jsazxc1b86g2ww569ziwhhvkz8z43vjd-gcc-5.4.0/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/include/stdint.h:9,
from /tmp/nix-build-perf-linux-4.4.19.drv-0/linux-4.4.19/tools/include/linux/types.h:6,
from util/event.c:1:
/nix/store/8ic0jwg3p5vcwx52k4781n987hmv0bks-glibc-2.24-dev/include/dirent.h:189:12: note: declared here
extern int __REDIRECT (readdir_r,
^
util/event.c: In function 'perf_event__synthesize_threads':
util/event.c:586:2: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations]
while (!readdir_r(proc, &dirent, &next) && next) {
Fix by adding -Wno-error=deprecated-declarations compile flag.
53 lines
1.8 KiB
Nix
53 lines
1.8 KiB
Nix
{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
|
|
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
|
|
, libiberty
|
|
, zlib, withGtk ? false, gtk ? null }:
|
|
|
|
with lib;
|
|
|
|
assert withGtk -> gtk != null;
|
|
assert versionAtLeast kernel.version "3.12";
|
|
|
|
stdenv.mkDerivation {
|
|
name = "perf-linux-${kernel.version}";
|
|
|
|
inherit (kernel) src patches;
|
|
|
|
preConfigure = ''
|
|
cd tools/perf
|
|
sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
|
|
${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"}
|
|
[ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
|
|
export makeFlags="DESTDIR=$out $makeFlags"
|
|
'';
|
|
|
|
# perf refers both to newt and slang
|
|
# binutils is required for libbfd.
|
|
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
|
|
flex bison libiberty ];
|
|
buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
|
|
stdenv.lib.optional withGtk gtk;
|
|
|
|
# Note: we don't add elfutils to buildInputs, since it provides a
|
|
# bad `ld' and other stuff.
|
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=bool-compare -Wno-error=deprecated-declarations";
|
|
|
|
installFlags = "install install-man ASCIIDOC8=1";
|
|
|
|
crossAttrs = {
|
|
/* I don't want cross-python or cross-perl -
|
|
I don't know if cross-python even works */
|
|
propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ];
|
|
makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
|
|
elfutils = elfutils.crossDrv;
|
|
inherit (kernel.crossDrv) src patches;
|
|
};
|
|
|
|
meta = {
|
|
homepage = https://perf.wiki.kernel.org/;
|
|
description = "Linux tools to profile with performance counters";
|
|
maintainers = with stdenv.lib.maintainers; [viric];
|
|
platforms = with stdenv.lib.platforms; linux;
|
|
};
|
|
}
|