• Arnaldo Carvalho de Melo's avatar
    Revert "tools headers: Remove almost unused copy of uapi/stat.h, add few conditional defines" · 61ba075d
    Arnaldo Carvalho de Melo authored
    This reverts commit a672af91.
    
    By now it is not used for building tools/perf, but Stephen Rothwell
    reported that when building on a O= directory that had been built with
    torvalds/master and this perf build command line:
    
      $ make -C tools/perf -f Makefile.perf -s -O -j60 O=/home/sfr/next/perf NO_BPF_SKEL=1
    
    If we then merge perf-tools-next, as he did for linux-next, then we end
    up with a build failure for libbpf:
    
        PERF_VERSION = 6.9.rc3.g42c4635c8dee
      make[3]: *** No rule to make target '/home/sfr/next/next/tools/include/uapi/linux/stat.h', needed by '/home/sfr/next/perf/libbpf/staticobjs/libbpf.o'.  Stop.
      make[2]: *** [Makefile:157: /home/sfr/next/perf/libbpf/staticobjs/libbpf-in.o] Error 2
      make[1]: *** [Makefile.perf:892: /home/sfr/next/perf/libbpf/libbpf.a] Error 2
      make[1]: *** Waiting for unfinished jobs....
      make: *** [Makefile.perf:264: sub-make] Error 2
    
    This needs to be further investigated to figure out how to check if
    libbpf really needs something that is in that
    tools/include/uapi/linux/stat.h file and if not to remove that file in a
    way that we don't break the build in any situation, to avoid requiring
    doing a 'make clean'.
    Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
    Tested-by: Stephen Rothwell <sfr@canb.auug.org.au> # PowerPC le incermental build
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: https://lore.kernel.org/lkml/20240413124340.4d48c6d8@canb.auug.org.auSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    61ba075d
check-headers.sh 6.03 KB