perf: build TUI by default by pulling in slang and linking it statically

Orabug: 25161079

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 59a98c6432403874a564753dd6e790b8632b672e..549412ebccf5309010bab6953f05ff44e4d092ea 100644 (file)
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -378,7 +378,7 @@ ifndef NO_SLANG
     # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
     CFLAGS += -I/usr/include/slang
     CFLAGS += -DHAVE_SLANG_SUPPORT
-    EXTLIBS += -lslang
+    EXTLIBS += -Wl,-Bstatic -lslang -Wl,-Bdynamic
     $(call detected,CONFIG_SLANG)
   endif
 endif

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 6a3f99afdbb4b6b9f5af0a04587bdb09501787ef..39ba70132f760ac057655925aaa8b4e665ef56db 100644 (file)
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -90,6 +90,8 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+# TUI for perf
+%define with_perf_tui  1
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -525,6 +527,9 @@ BuildRequires: hmaccalc
 %if %{with_dtrace}
 BuildRequires: libdtrace-ctf-devel >= 0.5.0
 %endif
+%if %{with_perf_tui}
+BuildRequires: slang-devel, slang-static
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2

diff --git a/uek-rpm/ol7/kernel-uek.spec b/uek-rpm/ol7/kernel-uek.spec
index 129ffccbb71f0c2918412ba53b428b2ce5647a5c..f36c48f7686de38363cefc39b9a8ad3449ab01bd 100644 (file)
--- a/uek-rpm/ol7/kernel-uek.spec
+++ b/uek-rpm/ol7/kernel-uek.spec
@@ -90,6 +90,8 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+# TUI for perf
+%define with_perf_tui  1
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -520,6 +522,9 @@ BuildRequires: hmaccalc
 %if %{with_dtrace}
 BuildRequires: libdtrace-ctf-devel >= 0.5.0
 %endif
+%if %{with_perf_tui}
+BuildRequires: slang-devel, slang-static
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2