Fix building when asm/page.h is not available #168278 by Daniel Black.

Package-Manager: portage-2.1.2-r13

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index c81c6e49f4108e4d959c16e1e157ca7a13f13f60..7db64ccc43f17188efa8768443bedea7f65b0a31 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # 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.178 2007/01/31 21:09:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.179 2007/03/03 06:13:04 vapier Exp $
+
+  03 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12r-HAVE_asm_page_h.patch, util-linux-2.12r-r5.ebuild:
+  Fix building when asm/page.h is not available #168278 by Daniel Black.
 
   31 Jan 2007; Markus Rothe <corsair@gentoo.org> util-linux-2.12r-r5.ebuild:
   Stable on ppc64; bug #164011

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9b798a4e03f8a53b5b45342a0d9d712a5f2b4ca9..7a9da776c26849f8fa806bcd8dfb64188e800f2f 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 442 RMD160 cd8177c5b6976f2d5f5f997281a31ce18a64092a SHA1 a7882671e71b073b3cccc3189b715f243db56ff8 SHA256 47c8d7029e0fdf77425c2c5d593a46315d6b3b2539a019af228bcf88ed8168d6
 MD5 fc01656c85a58c998f5487eb72f44035 files/crypto-loop.confd 442
 RMD160 cd8177c5b6976f2d5f5f997281a31ce18a64092a files/crypto-loop.confd 442
@@ -110,6 +113,10 @@ AUX util-linux-2.12q-use-update_mtab-for-fake.patch 546 RMD160 fada9ac9cb1fc76d5
 MD5 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
 RMD160 fada9ac9cb1fc76d51b5b49e193b6d08ef385e5a files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
 SHA256 b9a883947be436346f41b3387c5fe10e17e832d16a586c9ddcecd0598757dcb3 files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
+AUX util-linux-2.12r-HAVE_asm_page_h.patch 578 RMD160 da482a71e7d95091975833bc67ca500b75d1d7ea SHA1 77270b12796b30787af32da86a00e9afff42d18a SHA256 e6c6e878a9caf01211dea48805037f09c19564740680ebc841488677b635d58e
+MD5 e2811263189441e0d7c555fa8e43e454 files/util-linux-2.12r-HAVE_asm_page_h.patch 578
+RMD160 da482a71e7d95091975833bc67ca500b75d1d7ea files/util-linux-2.12r-HAVE_asm_page_h.patch 578
+SHA256 e6c6e878a9caf01211dea48805037f09c19564740680ebc841488677b635d58e files/util-linux-2.12r-HAVE_asm_page_h.patch 578
 AUX util-linux-2.12r-cal-dumb-terminal.patch 824 RMD160 134349a02d588c601367cf6359722d42180d6a52 SHA1 03eda7ace8f1c91584d44a3479ca829a94cfb0c8 SHA256 ca25d6caf429996d6ab24169aad09e530fc78cbd6f65cb2c8307b50676603ba8
 MD5 1fcb9c258e5e86d3d4920ab3a5fe37da files/util-linux-2.12r-cal-dumb-terminal.patch 824
 RMD160 134349a02d588c601367cf6359722d42180d6a52 files/util-linux-2.12r-cal-dumb-terminal.patch 824
@@ -152,18 +159,18 @@ EBUILD util-linux-2.12r-r4.ebuild 6183 RMD160 101947bd6a5d3d1ff0165c455f09b460a4
 MD5 1007944e07bafbd4a7b3148d18908ae1 util-linux-2.12r-r4.ebuild 6183
 RMD160 101947bd6a5d3d1ff0165c455f09b460a4f53c75 util-linux-2.12r-r4.ebuild 6183
 SHA256 b38f53ff05b6313f2de702bed477d0f08039e089588a84f0ee081e143ebb0e16 util-linux-2.12r-r4.ebuild 6183
-EBUILD util-linux-2.12r-r5.ebuild 6245 RMD160 1dc976addc16ff488469fd99935c80a922aed8bc SHA1 1f13e96a373dfd29376603738aec60023d4c160b SHA256 c2cb59fa3a0111a5ac26dbd35957a8ca08e6fd0a3179eb762670f51cafe1d5e9
-MD5 0d8b248583b43d5513a5deeec7207c53 util-linux-2.12r-r5.ebuild 6245
-RMD160 1dc976addc16ff488469fd99935c80a922aed8bc util-linux-2.12r-r5.ebuild 6245
-SHA256 c2cb59fa3a0111a5ac26dbd35957a8ca08e6fd0a3179eb762670f51cafe1d5e9 util-linux-2.12r-r5.ebuild 6245
+EBUILD util-linux-2.12r-r5.ebuild 6308 RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac506c99 SHA1 766be704ac8a9420115ef3ce2795eb3ae56e9cfd SHA256 7b9d9aadcafad3686ae13d4eecbb054d0ddea2058efa7876be044069c666ac85
+MD5 29269b9593f23aeff06ba5c8140cd97c util-linux-2.12r-r5.ebuild 6308
+RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac506c99 util-linux-2.12r-r5.ebuild 6308
+SHA256 7b9d9aadcafad3686ae13d4eecbb054d0ddea2058efa7876be044069c666ac85 util-linux-2.12r-r5.ebuild 6308
 EBUILD util-linux-2.13_pre7.ebuild 3966 RMD160 f908f9199799b1c65a73fbf7c29ec0b6a522be83 SHA1 50e95795a6fe13317d3e1c2b7d54dfe6c057bd30 SHA256 236b7e91f981ab7bf84b7d59ea4fe7054cebf180765c658e1fa0f92986cdaf8e
 MD5 46e4a318d6d4ec1f9f7b1143e0f99a06 util-linux-2.13_pre7.ebuild 3966
 RMD160 f908f9199799b1c65a73fbf7c29ec0b6a522be83 util-linux-2.13_pre7.ebuild 3966
 SHA256 236b7e91f981ab7bf84b7d59ea4fe7054cebf180765c658e1fa0f92986cdaf8e util-linux-2.13_pre7.ebuild 3966
-MISC ChangeLog 27968 RMD160 db448c7537df1e75e9a0a95cfc15a1656a91bf7d SHA1 417b88ea66084c12aaf20c9d7e0c18acf8881832 SHA256 0b3093e7f244a764839ac8f55d9e433bac61e2b7392a2a7369dc1a2bfb99913d
-MD5 4d2526edada07b830fbc7478ace18b89 ChangeLog 27968
-RMD160 db448c7537df1e75e9a0a95cfc15a1656a91bf7d ChangeLog 27968
-SHA256 0b3093e7f244a764839ac8f55d9e433bac61e2b7392a2a7369dc1a2bfb99913d ChangeLog 27968
+MISC ChangeLog 28168 RMD160 cb7f73066a4875939783b23447156804265c77b0 SHA1 80c029fc326665cc79f14423b5296637cb27b0ee SHA256 fa04e164b4e19d4e70920030f09ef92acdbc33fc509456d8c93076a396f1aac6
+MD5 274b105877b888cf1105c6c9bab72e6f ChangeLog 28168
+RMD160 cb7f73066a4875939783b23447156804265c77b0 ChangeLog 28168
+SHA256 fa04e164b4e19d4e70920030f09ef92acdbc33fc509456d8c93076a396f1aac6 ChangeLog 28168
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -177,3 +184,10 @@ SHA256 60efe4ca6a920b4545e7d25e13ac9a54b9513c95c57af7c125855166beec0e8b files/di
 MD5 a037be4e6f33cbd71a764cbcb1e8db7e files/digest-util-linux-2.13_pre7 515
 RMD160 cf656aa56dd77972b95d027a442b12972ef2e891 files/digest-util-linux-2.13_pre7 515
 SHA256 2b463c8ec2a6734ee0dbe32781c512bc5d4dd6e465101838d07ae00f0881058f files/digest-util-linux-2.13_pre7 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF6RH58bi6rjpTunYRAsn/AJ4mmVPhjaNk9NtW05R4KIG240RZ2QCghKl9
+xEGHUetPY2QPP8gLBAoUmrw=
+=ZNsv
+-----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..0f7c3e2
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
@@ -0,0 +1,28 @@
+fix building when asm/page.h is not available
+
+http://bugs.gentoo.org/168278
+
+--- disk-utils/fsck.cramfs.c
++++ disk-utils/fsck.cramfs.c
+@@ -76,7 +76,9 @@
+ 
+ #define PAD_SIZE 512
+ 
++#ifdef HAVE_asm_page_h
+ #include <asm/page.h>
++#endif
+ #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-r5.ebuild b/sys-apps/util-linux/util-linux-2.12r-r5.ebuild
index eb4180d4d07593eb72aff6a386f8004ab3ebf957..05ed32fdd32d77ba4f68f5b9a1475df3f5dfb899 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.12r-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r-r5.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-r5.ebuild,v 1.11 2007/01/31 21:09:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r5.ebuild,v 1.12 2007/03/03 06:13:04 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -118,6 +118,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-2.12-mips-lseek.patch
 
        epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852
+       epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h.patch #168278
 
        # Enable random features
        local mconfigs="MCONFIG"