tools build: Remove feature-libslang-include-subdir
Ian Rogers
reviewerPATCH 1/1 tools build: Remove feature-libslang-include-subdir
Added in commit cbefd24f0aee ("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 <[email protected]>
--- tools/build/feature/Makefile | 4 ---- tools/build/feature/test-libslang-include-subdir.c | 7 ------- tools/perf/Makefile.config | 9 ++------- tools/perf/ui/libslang.h | 4 ---- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 tools/build/feature/test-libslang-include-subdir.c
tools/build/feature/Makefile +0 -4
@@ -33,7 +33,6 @@ FILES= \ test-libperl.bin \ test-libpython.bin \ test-libslang.bin \ - test-libslang-include-subdir.bin \ test-libtraceevent.bin \ test-libcpupower.bin \ test-libtracefs.bin \
@@ -229,9 +228,6 @@ $(OUTPUT)test-libunwind-debug-frame-aarch64.bin: $(OUTPUT)test-libslang.bin: $(BUILD) -lslang -$(OUTPUT)test-libslang-include-subdir.bin: - $(BUILD) -lslang - $(OUTPUT)test-libtraceevent.bin: $(BUILD) -ltraceevent
tools/build/feature/test-libslang-include-subdir.c deleted +0 -7
@@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <slang/slang.h> - -int main (void ) -{ -return SLsmg_init_smg (); -}
tools/perf/Makefile.config +2 -7
@@ -773,15 +773,10 @@ endif ifndef NO_SLANG 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) - NO_SLANG := 1 - else - CFLAGS += -DHAVE_SLANG_INCLUDE_SUBDIR - endif + $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev) + NO_SLANG := 1 endif ifndef NO_SLANG - # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h CFLAGS += -DHAVE_SLANG_SUPPORT EXTLIBS += -lslang $(call detected,CONFIG_SLANG)
tools/perf/ui/libslang.h +0 -4
@@ -15,11 +15,7 @@#define ENABLE_SLFUTURE_CONST 1#define ENABLE_SLFUTURE_VOID 1 -#ifdef HAVE_SLANG_INCLUDE_SUBDIR -#include <slang/slang.h> -#else #include <slang.h> -#endif #define SL_KEY_UNTAB 0x1000
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Quoted 4 lines · Ian Rogers
Added in commit
cbefd24f0aee("tools build: Add test to check ifslang.his 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.
Thanks, applied to perf-tools-next,
- Arnaldo