- Adding major version in the libnuma soname
This commit is contained in:
parent
e0d1f64d14
commit
723e5fbb9d
@ -0,0 +1,42 @@
|
|||||||
|
From a6dfe2648a39d5fed8de0361aecf0e035ad80222 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jim Warner <james.warner@comcast.net>
|
||||||
|
Date: Thu, 6 Jun 2013 00:00:00 -0500
|
||||||
|
Subject: [PATCH] top: add the major version to dlopen of libnuma soname
|
||||||
|
|
||||||
|
When the plug-in approach to NUMA support was added, I
|
||||||
|
carelessly employed the compile-time linker convention
|
||||||
|
for naming the library. Technically this then required
|
||||||
|
the 'devel' package for NUMA support to be present for
|
||||||
|
the unqualified soname symlink to be available. Either
|
||||||
|
that or one must have manually created such a symlink.
|
||||||
|
|
||||||
|
This commit adds the missing major version to dlopen()
|
||||||
|
of libnuma.so.1 so simply having a more likely package
|
||||||
|
such as 'numactl' will enable both '2' & '3' commands.
|
||||||
|
|
||||||
|
References(s):
|
||||||
|
http://www.freelists.org/post/procps/top-NUMA-node-CPU-utilization-support,25
|
||||||
|
. initial dlopen support
|
||||||
|
commit edba932a7e9b950dd91bc486e107788e977a5186
|
||||||
|
|
||||||
|
Signed-off-by: Jim Warner <james.warner@comcast.net>
|
||||||
|
---
|
||||||
|
top/top.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/top/top.c b/top/top.c
|
||||||
|
index c1853ee..1d38c0f 100644
|
||||||
|
--- a/top/top.c
|
||||||
|
+++ b/top/top.c
|
||||||
|
@@ -3246,7 +3246,7 @@ static void before (char *me) {
|
||||||
|
#if defined(PRETEND_NUMA) || defined(PRETEND8CPUS)
|
||||||
|
Numa_node_tot = Numa_max_node() + 1;
|
||||||
|
#else
|
||||||
|
- Libnuma_handle = dlopen("libnuma.so", RTLD_LAZY);
|
||||||
|
+ Libnuma_handle = dlopen("libnuma.so.1", RTLD_LAZY);
|
||||||
|
if (Libnuma_handle) {
|
||||||
|
Numa_max_node = dlsym(Libnuma_handle, "numa_max_node");
|
||||||
|
Numa_node_of_cpu = dlsym(Libnuma_handle, "numa_node_of_cpu");
|
||||||
|
--
|
||||||
|
1.8.1.2
|
||||||
|
|
@ -3,13 +3,15 @@
|
|||||||
Summary: System and process monitoring utilities
|
Summary: System and process monitoring utilities
|
||||||
Name: procps-ng
|
Name: procps-ng
|
||||||
Version: 3.3.8
|
Version: 3.3.8
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: https://sourceforge.net/projects/procps-ng/
|
URL: https://sourceforge.net/projects/procps-ng/
|
||||||
|
|
||||||
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch0: 0001-top-add-the-major-version-to-dlopen-of-libnuma-sonam.patch
|
||||||
|
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(postun): /sbin/ldconfig
|
||||||
|
|
||||||
@ -64,6 +66,8 @@ System and process monitoring utilities development headers
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# The following stuff is needed for git archives only
|
# The following stuff is needed for git archives only
|
||||||
#echo "%{version}" > .tarball-version
|
#echo "%{version}" > .tarball-version
|
||||||
@ -126,6 +130,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
|
|||||||
%{_includedir}/proc
|
%{_includedir}/proc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 12 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.8-3
|
||||||
|
- Adding major version in the libnuma soname
|
||||||
|
|
||||||
* Thu May 30 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.8-2
|
* Thu May 30 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.8-2
|
||||||
- watch: enabling UTF-8 (#965867)
|
- watch: enabling UTF-8 (#965867)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user