diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-03 21:22:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-03 21:22:18 +0000 |
| commit | fea06b0ed0fdcc36a1f37f6f4817b45cfb206d69 (patch) | |
| tree | a17b0e2f939d092ac06efe9551d0264565293cc3 /sys-apps/util-linux | |
| parent | arm/ia64/s390/sh stable #169099 (diff) | |
| download | gentoo-2-fea06b0ed0fdcc36a1f37f6f4817b45cfb206d69.tar.gz gentoo-2-fea06b0ed0fdcc36a1f37f6f4817b45cfb206d69.tar.bz2 gentoo-2-fea06b0ed0fdcc36a1f37f6f4817b45cfb206d69.zip | |
Split the asm/page.h patch to account for USE=-crypt #169133 by Milan Barta.
(Portage version: 2.1.2-r13)
Diffstat (limited to 'sys-apps/util-linux')
4 files changed, 27 insertions, 14 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 2f74519b1d7e..3ad1a13107d6 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.180 2007/03/03 06:21:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.181 2007/03/03 21:22:18 vapier Exp $ + + 03 Mar 2007; Mike Frysinger <vapier@gentoo.org> + files/util-linux-2.12r-HAVE_asm_page_h.patch, + +files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch, + util-linux-2.12r-r6.ebuild: + Split the asm/page.h patch to account for USE=-crypt #169133 by Milan Barta. *util-linux-2.12r-r6 (03 Mar 2007) diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch new file mode 100644 index 000000000000..8c5bbc7aece9 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch @@ -0,0 +1,18 @@ +fix building when asm/page.h is not available + +http://bugs.gentoo.org/168278 + +the loop-aes patch adds this ... + +--- mount/swapon.c ++++ mount/swapon.c +@@ -31,7 +31,9 @@ + #include <sys/ioctl.h> + #include <sys/utsname.h> + #include <sys/time.h> ++#ifdef HAVE_asm_page_h + #include <asm/page.h> ++#endif + #include "xmalloc.h" + #include "swap_constants.h" + #include "swapargs.h" diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch index 0f7c3e252f70..21c04709d809 100644 --- a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch +++ b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch @@ -14,15 +14,3 @@ http://bugs.gentoo.org/168278 #ifdef PAGE_SIZE #define PAGE_CACHE_SIZE ((int) PAGE_SIZE) #elif defined __ia64__ ---- mount/swapon.c -+++ mount/swapon.c -@@ -31,7 +31,9 @@ - #include <sys/ioctl.h> - #include <sys/utsname.h> - #include <sys/time.h> -+#ifdef HAVE_asm_page_h - #include <asm/page.h> -+#endif - #include "xmalloc.h" - #include "swap_constants.h" - #include "swapargs.h" diff --git a/sys-apps/util-linux/util-linux-2.12r-r6.ebuild b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild index 8f953be387da..b7827d2b2995 100644 --- a/sys-apps/util-linux/util-linux-2.12r-r6.ebuild +++ b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r6.ebuild,v 1.1 2007/03/03 06:21:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r6.ebuild,v 1.2 2007/03/03 21:22:18 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -119,6 +119,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852 epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h.patch #168278 + use crypt && epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h-loop-aes.patch # Enable random features local mconfigs="MCONFIG" |