From 344fc208eaa97d7f3860f27284a0efe6f17ddc78 Mon Sep 17 00:00:00 2001
From: David Spencer <idlemoor@slackbuilds.org>
Date: Mon, 28 Mar 2016 11:51:22 +0100
Subject: development/perf: Updated for version 4.4.6.

Fix build failure with optional deps.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/perf/README          | 4 +---
 development/perf/perf.SlackBuild | 5 +++--
 development/perf/perf.info       | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'development')

diff --git a/development/perf/README b/development/perf/README
index 3eaadb7db3..28fa61b406 100644
--- a/development/perf/README
+++ b/development/perf/README
@@ -7,6 +7,4 @@ identify hotspots.
 Please note that this SBo doesn't have any sources in the DOWNLOAD
 setting, as the sources are already part of a full slackware install.
 
-Optional dependencies: audit, numactl
-Another optional dependency is libunwind, but it's unsupported for now
-since it requires elfutils which we don't have yet on SBO.
+Optional dependencies: audit, numactl, libunwind
diff --git a/development/perf/perf.SlackBuild b/development/perf/perf.SlackBuild
index 927c235c75..16ce1bcc0c 100644
--- a/development/perf/perf.SlackBuild
+++ b/development/perf/perf.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perf
-VERSION=${VERSION:-4.4}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,8 @@ rm -f $SRCDIR/.config-detected
 
 # Fixup paths (sysconfdir= and mandir= don't work)
 mv $PKG/usr/share/man $PKG/usr/man
-rmdir $PKG/usr/share
+# if perf is built with optional deps, $PKG/usr/share/perf-core exists
+rmdir --ignore-fail-on-non-empty $PKG/usr/share
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/perf/perf.info b/development/perf/perf.info
index cfda30701d..3712f5beac 100644
--- a/development/perf/perf.info
+++ b/development/perf/perf.info
@@ -1,5 +1,5 @@
 PRGNAM="perf"
-VERSION="4.4"
+VERSION="4.4.6"
 HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page"
 DOWNLOAD="http://www.pastemobile.org/perf.dummy"
 MD5SUM="9cba6c70fb57a22a155073d54748b614"
-- 
cgit v1.2.3