summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-08-31 11:28:32 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit12de98b2e3d996e49ec2195579be08eb507107b8 (patch)
treee158489c0183c06cc1053a75b11d873d0c5a2771
parent2e7b4608396e351dd70458cd7df099b90af7c1be (diff)
downloadslackbuilds-12de98b2e3d996e49ec2195579be08eb507107b8.tar.gz
development/perf: Updated for version 4.1.6.
Fixes build failure on Linux 4.1.6. Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/perf/perf.SlackBuild48
-rw-r--r--development/perf/perf.info2
2 files changed, 25 insertions, 25 deletions
diff --git a/development/perf/perf.SlackBuild b/development/perf/perf.SlackBuild
index 3300137091..db0a537d95 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:-3.10.17}
+VERSION=${VERSION:-4.1.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,27 +56,27 @@ fi
set -e
-SRCDIR="/usr/src/linux-$VERSION/tools"
+SRCDIR="/usr/src/linux-$VERSION/tools/perf"
BUILDDIR=$TMP/$PRGNAM-$VERSION
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $BUILDDIR
-
-mkdir -p $BUILDDIR/lib/lk
-cd $BUILDDIR
-make -C $SRCDIR/lib/lk/ O=$BUILDDIR/lib/lk
-# We need -DSILENT_NO_TAINT_SUPPORT=0, -DNO_TAINT_SUPPORT=0, and
-# -Wno-strict-default to compile together with perl 5.18+
-make -C $SRCDIR/ perf_install O=$BUILDDIR DESTDIR=$PKG/ \
- mandir=/usr/man/ perfexecdir=/usr/libexec/perf-core \
- CFLAGS="-DSILENT_NO_TAINT_SUPPORT=0 -DNO_TAINT_SUPPORT=0" \
- -Wno-strict-default
-
-mkdir $PKG/usr/bin
-mv $PKG/bin/perf $PKG/usr/bin/perf
-rm -rf $PKG/bin
+rm -rf $PKG $BUILDDIR
+mkdir -p $TMP $PKG $BUILDDIR $OUTPUT
+
+cd $SRCDIR
+
+make \
+ O=$BUILDDIR \
+ DESTDIR=$PKG/ \
+ prefix=/usr \
+ EXTRA_CFLAGS="$SLKCFLAGS" \
+ install
+
+# Tidy up the source tree :-(
+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
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
@@ -86,10 +86,10 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $DOCDIR/Documentation
-
-cp -a $SRCDIR/perf/command-list.txt $SRCDIR/perf/design.txt \
- $SRCDIR/perf/CREDITS $SRCDIR/../COPYING $DOCDIR
-cp -a $SRCDIR/perf/Documentation/*.txt $DOCDIR/Documentation
+cp -a command-list.txt design.txt \
+ CREDITS ../../COPYING \
+ $DOCDIR
+cp -a Documentation/*.txt $DOCDIR/Documentation
cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/perf/perf.info b/development/perf/perf.info
index 47a1d618f9..3e67ce7575 100644
--- a/development/perf/perf.info
+++ b/development/perf/perf.info
@@ -1,5 +1,5 @@
PRGNAM="perf"
-VERSION="3.10.17"
+VERSION="4.1.6"
HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page"
DOWNLOAD="http://www.pastemobile.org/perf.dummy"
MD5SUM="9cba6c70fb57a22a155073d54748b614"