tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tools build: Remove feature-libslang-include-subdir

Added in commit cbefd24f0aee3a5d ("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>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo c5b76ab5 a5099d81

+2 -22
-4
tools/build/feature/Makefile
··· 33 33 test-libperl.bin \ 34 34 test-libpython.bin \ 35 35 test-libslang.bin \ 36 - test-libslang-include-subdir.bin \ 37 36 test-libtraceevent.bin \ 38 37 test-libcpupower.bin \ 39 38 test-libtracefs.bin \ ··· 227 228 $(BUILD) -lelf -llzma -lunwind-aarch64 228 229 229 230 $(OUTPUT)test-libslang.bin: 230 - $(BUILD) -lslang 231 - 232 - $(OUTPUT)test-libslang-include-subdir.bin: 233 231 $(BUILD) -lslang 234 232 235 233 $(OUTPUT)test-libtraceevent.bin:
-7
tools/build/feature/test-libslang-include-subdir.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - #include <slang/slang.h> 3 - 4 - int main(void) 5 - { 6 - return SLsmg_init_smg(); 7 - }
+2 -7
tools/perf/Makefile.config
··· 780 780 781 781 ifndef NO_SLANG 782 782 ifneq ($(feature-libslang), 1) 783 - ifneq ($(feature-libslang-include-subdir), 1) 784 - $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev) 785 - NO_SLANG := 1 786 - else 787 - CFLAGS += -DHAVE_SLANG_INCLUDE_SUBDIR 788 - endif 783 + $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev) 784 + NO_SLANG := 1 789 785 endif 790 786 ifndef NO_SLANG 791 - # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h 792 787 CFLAGS += -DHAVE_SLANG_SUPPORT 793 788 EXTLIBS += -lslang 794 789 $(call detected,CONFIG_SLANG)
-4
tools/perf/ui/libslang.h
··· 15 15 #define ENABLE_SLFUTURE_CONST 1 16 16 #define ENABLE_SLFUTURE_VOID 1 17 17 18 - #ifdef HAVE_SLANG_INCLUDE_SUBDIR 19 - #include <slang/slang.h> 20 - #else 21 18 #include <slang.h> 22 - #endif 23 19 24 20 #define SL_KEY_UNTAB 0x1000 25 21