access() is a macro which uses R_OK. However R_OK is not defined on sparc during a bootstrap unless we actually include unistd.h

5 files changed, 43 insertions, 15 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index a897e5492205..3736a3759900 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.77 2004/04/20 03:44:38 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.78 2004/05/09 01:45:29 solar Exp $
+
+  08 May 2004; <solar@gentoo.org> util-linux-2.12-r4.ebuild,
+  util-linux-2.12-r5.ebuild, files/util-linux-2.12-swapon-unistd.patch:
+  access() is a macro which uses R_OK. However R_OK is not defined on sparc
+  during a bootstrap unless we actually include unistd.h
 
   19 Apr 2004; Travis Tilley <lv@gentoo.org> util-linux-2.11z-r9.ebuild,
   util-linux-2.12-r2.ebuild, util-linux-2.12-r3.ebuild,
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index cf9bd7beb4e8..15e63b093062 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,8 +1,19 @@
+MD5 18e932d6a5e6be50e7932ac6d820d6c2 ChangeLog 12666
+MD5 b5441e9a6affef79fe855edc4733d3d7 util-linux-2.11z-r8.ebuild 3188
+MD5 7489b064e5753bda6a5739a01e892d15 util-linux-2.11z-r9.ebuild 3403
+MD5 7f695fb568961c0e4d1517dbd653e4fd util-linux-2.12-r2.ebuild 3217
+MD5 6a0f84df4ae9fd7fdcd83d2c9cb56fce util-linux-2.12-r3.ebuild 3734
+MD5 9d7c01d2206ebf5f5df919a96b2f63ca util-linux-2.12-r4.ebuild 4054
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 73e82b92c4515b641e5a5d78520304d3 util-linux-2.12-r5.ebuild 4138
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
 MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
 MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
+MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
+MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
 MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
 MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
@@ -10,19 +21,9 @@ MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
 MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
-MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
 MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
 MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
 MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
-MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
 MD5 11fdaf3d68904b318fbffd7243e719b7 files/util-linux-2.12-amd64_rdev_installation.patch 737
-MD5 eac1330256dfe6f8655eb1fd73cf1e60 ChangeLog 12399
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b5441e9a6affef79fe855edc4733d3d7 util-linux-2.11z-r8.ebuild 3188
-MD5 7489b064e5753bda6a5739a01e892d15 util-linux-2.11z-r9.ebuild 3403
-MD5 7f695fb568961c0e4d1517dbd653e4fd util-linux-2.12-r2.ebuild 3217
-MD5 6a0f84df4ae9fd7fdcd83d2c9cb56fce util-linux-2.12-r3.ebuild 3734
-MD5 98056056d705dee3712df137ff664655 util-linux-2.12-r4.ebuild 3842
-MD5 6885fe934b675258610a67312df0ca83 util-linux-2.12-r5.ebuild 3927
+MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
+MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
diff --git a/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch b/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch
new file mode 100644
index 000000000000..982ab1da8dc6
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch
@@ -0,0 +1,11 @@
+--- mount/swapon.c.orig	2004-05-07 15:21:06.909712000 +0000
++++ mount/swapon.c	2004-05-07 15:21:28.319712000 +0000
+@@ -21,6 +21,7 @@
+ #include <mntent.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "swap_constants.h"
+ #include "swapargs.h"
+ #include "nls.h"
+
diff --git a/sys-apps/util-linux/util-linux-2.12-r4.ebuild b/sys-apps/util-linux/util-linux-2.12-r4.ebuild
index 7abbb649ccc9..d05049ae717c 100644
--- a/sys-apps/util-linux/util-linux-2.12-r4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r4.ebuild,v 1.11 2004/04/25 20:09:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r4.ebuild,v 1.12 2004/05/09 01:45:29 solar Exp $
 
 inherit eutils flag-o-matic
 
@@ -47,6 +47,11 @@ src_unpack() {
 	# Fix unreadable df output
 	epatch ${FILESDIR}/no-symlink-resolve.patch
 
+	# access() is a macro which uses R_OK however
+	# R_OK is not defined on sparc during a bootstrap 
+	# unless we actually include unistd.h -solar (May 07 2004)
+	epatch ${FILESDIR}/${PN}-2.12-swapon-unistd.patch
+
 	# Add the O option to agetty to display DNS domainname in the issue
 	# file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
 	#
@@ -106,6 +111,7 @@ src_unpack() {
 
 	# /bin/kill is provided by procps ONLY
 	epatch ${FILESDIR}/${PN}-no-kill.patch
+
 }
 
 src_compile() {
diff --git a/sys-apps/util-linux/util-linux-2.12-r5.ebuild b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
index cd511f26448e..9af49fc1f604 100644
--- a/sys-apps/util-linux/util-linux-2.12-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.7 2004/04/25 20:09:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.8 2004/05/09 01:45:29 solar Exp $
 
 inherit eutils flag-o-matic
 
@@ -47,6 +47,11 @@ src_unpack() {
 	# Fix unreadable df output
 	epatch ${FILESDIR}/no-symlink-resolve.patch
 
+	# access() is a macro which uses R_OK however
+	# R_OK is not defined on sparc during a bootstrap 
+	# unless we actually include unistd.h -solar (May 07 2004)
+	epatch ${FILESDIR}/${PN}-2.12-swapon-unistd.patch
+
 	# Add the O option to agetty to display DNS domainname in the issue
 	# file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
 	#