Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools build: Remove feature-libslang-include-subdir 

Added in commit cbefd24f0a ("tools build: Add test to check if
slang.h is in /usr/include/slang/") this feature was to fix build
support on now unsupported versions of RHEL 5 and 6. As 6 years has
passed let's remove the workaround.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2025-10-02 19:27:33 -07:00 committed by Arnaldo Carvalho de Melo
parent a5099d8143
commit c5b76ab525
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/build/feature/Makefile
View File

@ -33,7 +33,6 @@ FILES= \
test-libperl.bin \ test-libperl.bin \
test-libpython.bin \ test-libpython.bin \
test-libslang.bin \ test-libslang.bin \
test-libslang-include-subdir.bin \
test-libtraceevent.bin \ test-libtraceevent.bin \
test-libcpupower.bin \ test-libcpupower.bin \
test-libtracefs.bin \ test-libtracefs.bin \
@ -230,9 +229,6 @@ $(OUTPUT)test-libunwind-debug-frame-aarch64.bin:
$(OUTPUT)test-libslang.bin: $(OUTPUT)test-libslang.bin:
$(BUILD) -lslang $(BUILD) -lslang
$(OUTPUT)test-libslang-include-subdir.bin:
$(BUILD) -lslang
$(OUTPUT)test-libtraceevent.bin: $(OUTPUT)test-libtraceevent.bin:
$(BUILD) -ltraceevent $(BUILD) -ltraceevent

7
tools/build/feature/test-libslang-include-subdir.c
View File

@ -1,7 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
#include <slang/slang.h>
int main(void)
{
return SLsmg_init_smg();
}

9
tools/perf/Makefile.config
View File

@ -780,15 +780,10 @@ endif
ifndef NO_SLANG ifndef NO_SLANG
ifneq ($(feature-libslang), 1) ifneq ($(feature-libslang), 1)
ifneq ($(feature-libslang-include-subdir), 1) $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev)
$(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev) NO_SLANG := 1
NO_SLANG := 1
else
CFLAGS += -DHAVE_SLANG_INCLUDE_SUBDIR
endif
endif endif
ifndef NO_SLANG ifndef NO_SLANG
# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
CFLAGS += -DHAVE_SLANG_SUPPORT CFLAGS += -DHAVE_SLANG_SUPPORT
EXTLIBS += -lslang EXTLIBS += -lslang
$(call detected,CONFIG_SLANG) $(call detected,CONFIG_SLANG)

4
tools/perf/ui/libslang.h
View File

@ -15,11 +15,7 @@
#define ENABLE_SLFUTURE_CONST 1 #define ENABLE_SLFUTURE_CONST 1
#define ENABLE_SLFUTURE_VOID 1 #define ENABLE_SLFUTURE_VOID 1
#ifdef HAVE_SLANG_INCLUDE_SUBDIR
#include <slang/slang.h>
#else
#include <slang.h> #include <slang.h>
#endif
#define SL_KEY_UNTAB 0x1000 #define SL_KEY_UNTAB 0x1000