From c26c5b4591e0c0d31b4cba7a48bcc47c63891b0148ce613f8fd633c4fbb013ef Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 22 Nov 2011 13:44:00 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=60 --- procps-3.2.8-tinfo.dif | 16 ++++++++++++++++ procps.changes | 5 +++++ procps.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 procps-3.2.8-tinfo.dif diff --git a/procps-3.2.8-tinfo.dif b/procps-3.2.8-tinfo.dif new file mode 100644 index 0000000..325b8cd --- /dev/null +++ b/procps-3.2.8-tinfo.dif @@ -0,0 +1,16 @@ +--- Makefile ++++ Makefile 2011-11-22 13:36:47.115145920 +0000 +@@ -117,6 +117,13 @@ ifneq ($(MAKECMDGOALS),tar) + ifneq ($(MAKECMDGOALS),extratar) + ifneq ($(MAKECMDGOALS),beta) + ++# This macro gcc_library checks for a specifig library ++gcc_library = $(shell if $(CC) dummy.c -o /dev/null -l$(1:lib%=%) > /dev/null 2>&1 ; then echo "-l$(1:lib%=%)"; else echo "$(2)"; fi) ++ ++ifneq ($(call gcc_library,libtinfo),) ++CURSES += -ltinfo ++endif ++ + # Unlike the kernel one, this check_gcc goes all the way to + # producing an executable. There might be a -m64 that works + # until you go looking for a 64-bit curses library. diff --git a/procps.changes b/procps.changes index 02d009a..c074cb2 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 22 13:43:26 UTC 2011 - werner@suse.de + +- Add patch to use libtinfo if available + ------------------------------------------------------------------- Thu Oct 20 09:38:08 UTC 2011 - idonmez@suse.com diff --git a/procps.spec b/procps.spec index 9bd798e..8cdefaa 100644 --- a/procps.spec +++ b/procps.spec @@ -78,6 +78,7 @@ Patch39: procps-3.2.8-implement-pattern-option.diff Patch40: procps-3.2.8-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff Patch41: procps-3.2.7-petabytes.patch Patch42: procps-3.2.7-large_pcpu.patch +Patch43: procps-3.2.8-tinfo.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -148,6 +149,7 @@ Authors: %patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 %build make %{?_smp_mflags} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \