From fae63305a6e1055488e5503185333f43661a5e53 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 16 Dec 2011 16:40:54 +0100 Subject: [PATCH] oprofile: use coreutils to build, add patch to fix hardcoded paths. --- .../patches/opcontrol_hardcoded_path.patch | 15 +++++++++++++++ srcpkgs/oprofile/template | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch diff --git a/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch b/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch new file mode 100644 index 0000000000..02eefa190d --- /dev/null +++ b/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch @@ -0,0 +1,15 @@ +Assume that which and dirname are found in PATH, don't harcode your custom PATH. + +--- utils/opcontrol.orig 2011-12-16 16:32:00.405576367 +0100 ++++ utils/opcontrol 2011-12-16 16:32:25.755959905 +0100 +@@ -2156,8 +2156,8 @@ help_start_daemon_with_ibs() + # determine the location of opcontrol and related programs + if test -z "$OPDIR"; then + BINDIR="/usr/bin" +- OPCONTROL=`$BINDIR/which $0` +- OPDIR=`$BINDIR/dirname $OPCONTROL` ++ OPCONTROL=`which $0` ++ OPDIR=`dirname $OPCONTROL` + fi + + PATH=$OPDIR:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template index f21e8bd2bd..71b3088821 100644 --- a/srcpkgs/oprofile/template +++ b/srcpkgs/oprofile/template @@ -1,7 +1,7 @@ # Template file for 'oprofile' pkgname=oprofile version=0.9.7 -revision=1 +revision=2 homepage="http://oprofile.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure @@ -25,6 +25,7 @@ system_accounts="oprofile" oprofile_homedir="/var/lib/oprofile" make_dirs="/var/lib/oprofile 0750 oprofile oprofile" +Add_dependency build coreutils Add_dependency build qt-devel Add_dependency build zlib-devel Add_dependency build popt-devel