diff options
| author |   Malcolm Lashley <malc@gentoo.org> | 2005-05-09 01:18:26 +0000 |
|---|---|---|
| committer | Malcolm Lashley <malc@gentoo.org> | 2005-05-09 01:18:26 +0000 |
| commit | 2cfa2567bc038dc23fe79a5ad590a5d610c064a2 (patch) | |
| tree | 9eda6784209655fb145432a7dc4d4a5574735129 /sys-fs | |
| parent | stable on ia64 (diff) | |
| download | gentoo-2-2cfa2567bc038dc23fe79a5ad590a5d610c064a2.tar.gz gentoo-2-2cfa2567bc038dc23fe79a5ad590a5d610c064a2.tar.bz2 gentoo-2-2cfa2567bc038dc23fe79a5ad590a5d610c064a2.zip | |
Fix compilation on amd64 - closes bug #87580
(Portage version: 2.0.51.20-r5)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/unionfs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/unionfs/Manifest | 7 | ||||
| -rw-r--r-- | sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch | 20 | ||||
| -rw-r--r-- | sys-fs/unionfs/unionfs-1.0.11.ebuild | 4 |
4 files changed, 32 insertions, 5 deletions
diff --git a/sys-fs/unionfs/ChangeLog b/sys-fs/unionfs/ChangeLog index 2623efee8448..743d1d44fa02 100644 --- a/sys-fs/unionfs/ChangeLog +++ b/sys-fs/unionfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/unionfs # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.9 2005/04/01 21:27:03 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.10 2005/05/09 01:18:26 malc Exp $ + + 08 May 2005; Malcolm Lashley <malc@gentoo.org> + +files/unionfs-1.0.11-amd64.patch, unionfs-1.0.11.ebuild: + Fix compilation on amd64 - closes bug #87580 01 Apr 2005; Lars Weiler <pylon@gentoo.org> unionfs-1.0.11.ebuild: Added ~ppc. diff --git a/sys-fs/unionfs/Manifest b/sys-fs/unionfs/Manifest index dc093c5b5655..8d3c3d2854dc 100644 --- a/sys-fs/unionfs/Manifest +++ b/sys-fs/unionfs/Manifest @@ -4,15 +4,16 @@ MD5 8959da33bd490fabac57869170fb5cd2 unionfs-1.0.5.ebuild 778 MD5 3aeaf93d8df4ecb220fff7835bd1e75b unionfs-1.0.8-r1.ebuild 1488 MD5 e8b3222280b922ab2fcfcdbf880951a7 unionfs-1.0.8-r2.ebuild 1713 MD5 4970b965d7183e3424b52abea83f54ad unionfs-1.0.8.ebuild 1205 -MD5 0cffb451a8ec857edd5665ebdcb85c99 unionfs-1.0.9.ebuild 1210 MD5 a11b1ddcdb01e635fc75a2ac1a3b3a52 unionfs-1.0.10.ebuild 1287 -MD5 bf4b070b542318b125dded5c25fd0444 unionfs-1.0.11.ebuild 1292 +MD5 eec7b5d216391b5be18e11dfa3af02a9 unionfs-1.0.11.ebuild 1350 +MD5 0cffb451a8ec857edd5665ebdcb85c99 unionfs-1.0.9.ebuild 1210 MD5 3e8352aeb89adf9621000e68a01d1c42 files/digest-unionfs-1.0.5 64 MD5 ed43e0aa2c797f7089d0b5233c2f4a28 files/digest-unionfs-1.0.8 65 MD5 ed43e0aa2c797f7089d0b5233c2f4a28 files/digest-unionfs-1.0.8-r1 65 MD5 ed43e0aa2c797f7089d0b5233c2f4a28 files/digest-unionfs-1.0.8-r2 65 MD5 6653e7e3a3d5228979e268c072f39081 files/unionfs-1.0.8-vserver-GFP.patch 18519 MD5 ca0c70650ac2ad10a83bc3255de16baa files/unionfs-1.0.8-vserver.patch 520 -MD5 c1902d1e766d1e7ab247a4bf00131b72 files/digest-unionfs-1.0.9 65 MD5 7fa8dc7044d2dbf56ceb60eebb857be2 files/digest-unionfs-1.0.10 66 MD5 2410ef6f38ddf9737cbb13bfe0325c9a files/digest-unionfs-1.0.11 66 +MD5 c1902d1e766d1e7ab247a4bf00131b72 files/digest-unionfs-1.0.9 65 +MD5 f9a155123bfab53c81cb6c454492b797 files/unionfs-1.0.11-amd64.patch 586 diff --git a/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch b/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch new file mode 100644 index 000000000000..ae1564d546ca --- /dev/null +++ b/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch @@ -0,0 +1,20 @@ +--- unionfs-1.0.11/file.c 2005-03-24 03:25:47.000000000 +0000 ++++ unionfs-1.0.11_malc/file.c 2005-03-26 21:32:16.000000000 +0000 +@@ -22,6 +22,7 @@ + #include "fist.h" + #include "unionfs.h" + #include <linux/dcache.h> ++#include <linux/compat.h> + + /******************* + * File Operations * +--- unionfs-1.0.11/locks.c 2005-03-24 03:25:47.000000000 +0000 ++++ unionfs-1.0.11_malc/locks.c 2005-03-26 21:33:10.000000000 +0000 +@@ -22,6 +22,7 @@ + #endif /* HAVE_CONFIG_H */ + #include "fist.h" + #include "unionfs.h" ++#include <linux/compat.h> + + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) diff --git a/sys-fs/unionfs/unionfs-1.0.11.ebuild b/sys-fs/unionfs/unionfs-1.0.11.ebuild index 49cf3681a673..f45b0ea45489 100644 --- a/sys-fs/unionfs/unionfs-1.0.11.ebuild +++ b/sys-fs/unionfs/unionfs-1.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.11.ebuild,v 1.2 2005/04/01 21:27:03 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.11.ebuild,v 1.3 2005/05/09 01:18:26 malc Exp $ inherit eutils linux-mod @@ -26,6 +26,8 @@ src_unpack() { unpack ${A} cd ${S} + use amd64 && epatch ${FILESDIR}/${P}-amd64.patch || die + if ! use debug; then echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile} EXTRACFLAGS="${EXTRACFLAGS} -DNODEBUG" |