summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kalika <max@gentoo.org>2003-10-29 20:08:36 +0000
committerMax Kalika <max@gentoo.org>2003-10-29 20:08:36 +0000
commit1cf7d26bedb9c7315af1da5b7dd1cb18418d33e4 (patch)
treee373801c7c81718296ad33690ba831329bd39065 /sys-fs/trustees
parentversion bump (diff)
downloadgentoo-2-1cf7d26bedb9c7315af1da5b7dd1cb18418d33e4.tar.gz
gentoo-2-1cf7d26bedb9c7315af1da5b7dd1cb18418d33e4.tar.bz2
gentoo-2-1cf7d26bedb9c7315af1da5b7dd1cb18418d33e4.zip
Really fix link error. Move kernel check to pkg_setup(). Add echo of the compile operation. Use CFLAGS during compile.
Diffstat (limited to 'sys-fs/trustees')
-rw-r--r--sys-fs/trustees/ChangeLog6
-rw-r--r--sys-fs/trustees/Manifest4
-rw-r--r--sys-fs/trustees/trustees-2.10.ebuild19
3 files changed, 17 insertions, 12 deletions
diff --git a/sys-fs/trustees/ChangeLog b/sys-fs/trustees/ChangeLog
index ed1aa831ceb4..096fa2460a5f 100644
--- a/sys-fs/trustees/ChangeLog
+++ b/sys-fs/trustees/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/trustees
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/ChangeLog,v 1.3 2003/10/27 20:39:58 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/ChangeLog,v 1.4 2003/10/29 20:08:34 max Exp $
+
+ 29 Oct 2003; Max Kalika <max@gentoo.org> trustees-2.10.ebuild:
+ Really fix link error. Move kernel check to pkg_setup(). Add echo of the
+ compile operation. Use CFLAGS during compile.
27 Oct 2003; Max Kalika <max@gentoo.org> trustees-2.10.ebuild:
Fix linking error.
diff --git a/sys-fs/trustees/Manifest b/sys-fs/trustees/Manifest
index 69acb95bb5be..26ff55806708 100644
--- a/sys-fs/trustees/Manifest
+++ b/sys-fs/trustees/Manifest
@@ -1,5 +1,5 @@
-MD5 0935e5d806864de0b4e7a10bc03cfcc7 trustees-2.10.ebuild 1245
-MD5 59c6c6fe757e99445cbf1148687de1bc ChangeLog 1137
+MD5 91eff62426552e69c56f22a9cd818cfe trustees-2.10.ebuild 1330
+MD5 795893a5c612a3da624c03c3050edea7 ChangeLog 1326
MD5 8ef457f9ac46b73b855b4a4e5ff9d7d3 metadata.xml 243
MD5 e432f56a0708c59b388a5236aa597eaa files/trustees.rc6 1109
MD5 5ea664e13f218e834bc8e884aa8ec607 files/digest-trustees-2.10 61
diff --git a/sys-fs/trustees/trustees-2.10.ebuild b/sys-fs/trustees/trustees-2.10.ebuild
index 3fc81462513f..b962f8bbe6be 100644
--- a/sys-fs/trustees/trustees-2.10.ebuild
+++ b/sys-fs/trustees/trustees-2.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/trustees-2.10.ebuild,v 1.2 2003/10/27 20:39:58 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/trustees/trustees-2.10.ebuild,v 1.3 2003/10/29 20:08:34 max Exp $
DESCRIPTION="Advanced permission management system (ACLs) for Linux."
HOMEPAGE="http://trustees.sourceforge.net/"
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
S="${WORKDIR}"
-src_unpack() {
+pkg_setup() {
[ ! -e "/usr/src/linux/include/linux/trustee_struct.h" ] && {
eerror
eerror "Your currently linked kernel (/usr/src/linux) hasn't"
@@ -25,16 +25,17 @@ src_unpack() {
die "kernel not patched for trustees support"
}
- unpack ${A}
-
- # fix linking error
- sed -e '0,0i #include <errno.h>' \
- -i "${S}/set-trustee.c" || die "sed failed"
+ return 0
}
src_compile() {
- ${CC} -I/usr/src/linux/include \
- -o "settrustee" "set-trustee.c" || die "compile problem"
+ # Fix linking error.
+ sed -e '0,0i #include <errno.h>' "set-trustee.c" \
+ > settrustee.c || die "sed failed"
+
+ echo "${CC} ${CFLAGS} -I/usr/src/linux/include settrustee.c -o settrustee"
+ ${CC} ${CFLAGS} -I/usr/src/linux/include settrustee.c \
+ -o settrustee || die "compile problem"
}
src_install() {