summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-12-10 10:44:07 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-12-10 10:44:07 +0000
commit4c58b5dd2044a0af059f96c3ee75d4514d5db6a7 (patch)
treea8dca9f00e91fbd378485aba4440487a623cc5e1 /sys-process
parentVersion bump. (diff)
downloadgentoo-2-4c58b5dd2044a0af059f96c3ee75d4514d5db6a7.tar.gz
gentoo-2-4c58b5dd2044a0af059f96c3ee75d4514d5db6a7.tar.bz2
gentoo-2-4c58b5dd2044a0af059f96c3ee75d4514d5db6a7.zip
Fix build on G/FreeBSD. Bug #250383
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/lsof/ChangeLog6
-rw-r--r--sys-process/lsof/files/lsof-4.81-recmake.patch18
-rw-r--r--sys-process/lsof/lsof-4.81-r2.ebuild3
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index eee163a6a028..0cbdfc4ae314 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-process/lsof
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.53 2008/11/17 06:28:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.54 2008/12/10 10:44:07 aballier Exp $
+
+ 10 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/lsof-4.81-recmake.patch, lsof-4.81-r2.ebuild:
+ Fix build on G/FreeBSD. Bug #250383
*lsof-4.81-r2 (17 Nov 2008)
diff --git a/sys-process/lsof/files/lsof-4.81-recmake.patch b/sys-process/lsof/files/lsof-4.81-recmake.patch
new file mode 100644
index 000000000000..e6689448c656
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.81-recmake.patch
@@ -0,0 +1,18 @@
+Fix recursive make calls on G/FreeBSD
+Merged upstream; will appear in 4.82
+Or in:
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/lsof_4.82B.freebsd.tar.bz2
+
+https://bugs.gentoo.org/show_bug.cgi?id=250383
+
+--- lsof_4.81/lsof_4.81_src/dialects/freebsd/Makefile.old 2008-12-09 12:56:40 +0000
++++ lsof_4.81/lsof_4.81_src/dialects/freebsd/Makefile 2008-12-09 12:56:48 +0000
+@@ -129,7 +129,7 @@
+
+ dnode2.o: dzfs.h dnode2.c
+ @if [ -f ./Makefile.zfs ]; then \
+- make -f Makefile.zfs dnode2.o; \
++ ${MAKE} -f Makefile.zfs dnode2.o; \
+ else \
+ echo "${CC} ${CFLAGS} -c dnode2.c"; \
+ ${CC} ${CFLAGS} -c dnode2.c; \
diff --git a/sys-process/lsof/lsof-4.81-r2.ebuild b/sys-process/lsof/lsof-4.81-r2.ebuild
index d31130352cd0..705cc60ad7ec 100644
--- a/sys-process/lsof/lsof-4.81-r2.ebuild
+++ b/sys-process/lsof/lsof-4.81-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.81-r2.ebuild,v 1.1 2008/11/17 06:28:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.81-r2.ebuild,v 1.2 2008/12/10 10:44:07 aballier Exp $
inherit eutils flag-o-matic fixheadtails toolchain-funcs
@@ -42,6 +42,7 @@ src_unpack() {
-e 's/ -lselinux//' \
Configure || die "Sed failed. 404. WTF..."
fi
+ epatch "${FILESDIR}"/${P}-recmake.patch #250383 drop at next bump
}
src_compile() {