Fix building with linux-headers-2.6.18+ as _syscall#() no longer exists #150852 by...

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 39b272b44be4b8496a6531deee01d965f856ebc6..e3e75f97173f404bd6d3d906eaf92c88248ce3b5 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.169 2006/10/28 22:37:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.170 2006/10/31 07:43:50 vapier Exp $
+
+  31 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12r-no-_syscall.patch, util-linux-2.12r-r5.ebuild:
+  Fix building with linux-headers-2.6.18+ as _syscall#() no longer exists
+  #150852 by Mario Fetka.
 
 *util-linux-2.12r-r5 (28 Oct 2006)
 

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 4e9dbe07c7ef2a5e9b053b4fda58485eb8a46d2a..55b62c9470c8b463beb22dea019156e784378877 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -125,6 +125,10 @@ AUX util-linux-2.12r-fdisk-frame-pointers.patch 355 RMD160 e16e25ffd75a8e46fa2e4
 MD5 badd26600f4c31ecb524385ea1b7030c files/util-linux-2.12r-fdisk-frame-pointers.patch 355
 RMD160 e16e25ffd75a8e46fa2e4067b5178c7410491bad files/util-linux-2.12r-fdisk-frame-pointers.patch 355
 SHA256 afa3f0d16504f73db4ba4e5287e9b757da552e6751e58bd6dba9bcf380a2081a files/util-linux-2.12r-fdisk-frame-pointers.patch 355
+AUX util-linux-2.12r-no-_syscall.patch 1304 RMD160 e88ce3bca9cb36c26a45f3ccf7b9101e59583b32 SHA1 0c780486da014f6d306bbcdce42f612c581b9631 SHA256 e1a5f7f863f3fe4a2ab814999f6e046a79291e981795aee5f81cd81976b46024
+MD5 2201fb7d37dc1063a0ed242fdadaabe9 files/util-linux-2.12r-no-_syscall.patch 1304
+RMD160 e88ce3bca9cb36c26a45f3ccf7b9101e59583b32 files/util-linux-2.12r-no-_syscall.patch 1304
+SHA256 e1a5f7f863f3fe4a2ab814999f6e046a79291e981795aee5f81cd81976b46024 files/util-linux-2.12r-no-_syscall.patch 1304
 AUX util-linux-2.12r-umount-no-special.patch 329 RMD160 431eda56bb98ff317c9a2f224369494306c14a83 SHA1 b0ce5deb5a26c0e32c9f91c3e99f8aea4425c03d SHA256 3d84e1b6e9df4e5c8a0b38f2f0afdf524f5d7435abdf4420e9264e15181bf217
 MD5 dab68ae021d0131027f96e0b4747d3ab files/util-linux-2.12r-umount-no-special.patch 329
 RMD160 431eda56bb98ff317c9a2f224369494306c14a83 files/util-linux-2.12r-umount-no-special.patch 329
@@ -151,18 +155,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 6195 RMD160 38679199a5368d7ee11f8d3cb4f0b4e0800520a2 SHA1 718bc1c579cd7ee0ede938e67162a6104154be3f SHA256 5d5752f4517a5695c358e2088665f1262a25759ae71c7a3f00b45040f1e0c59c
-MD5 c31121488460423f9b31b067bfbda9ec util-linux-2.12r-r5.ebuild 6195
-RMD160 38679199a5368d7ee11f8d3cb4f0b4e0800520a2 util-linux-2.12r-r5.ebuild 6195
-SHA256 5d5752f4517a5695c358e2088665f1262a25759ae71c7a3f00b45040f1e0c59c util-linux-2.12r-r5.ebuild 6195
+EBUILD util-linux-2.12r-r5.ebuild 6256 RMD160 2976c12802db50d8a5091690e696a01a82405b61 SHA1 5397df2d0e17a28968df3c6bed4fdf4e5d7209b3 SHA256 5b92e4531688d9efdfb7160c878826047091b16a74047fa9fed76153c1aac734
+MD5 174ac51b99137109966848f2701f9cc2 util-linux-2.12r-r5.ebuild 6256
+RMD160 2976c12802db50d8a5091690e696a01a82405b61 util-linux-2.12r-r5.ebuild 6256
+SHA256 5b92e4531688d9efdfb7160c878826047091b16a74047fa9fed76153c1aac734 util-linux-2.12r-r5.ebuild 6256
 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 26842 RMD160 9ac8a607c541cf00ba2769411570402643e38371 SHA1 314f03e5a9f56a8a874e6c0d15b77e73afdafbf7 SHA256 a2c9ea146e9443af647957a32fc51aa3ec7d690718059ae5677502dcdedd3b89
-MD5 c653f3561938773f556f9e7940ed14d5 ChangeLog 26842
-RMD160 9ac8a607c541cf00ba2769411570402643e38371 ChangeLog 26842
-SHA256 a2c9ea146e9443af647957a32fc51aa3ec7d690718059ae5677502dcdedd3b89 ChangeLog 26842
+MISC ChangeLog 27066 RMD160 92df8f21a32d5787ec3482951c09f226c975fc7a SHA1 535b8bf213eedc883084ad882a22695f915a123d SHA256 ddfa2e009e035d64eca28bd9704b10ae521d33886c06505392103280f71075d2
+MD5 9887bc87fb64cb73f043a6629860197f ChangeLog 27066
+RMD160 92df8f21a32d5787ec3482951c09f226c975fc7a ChangeLog 27066
+SHA256 ddfa2e009e035d64eca28bd9704b10ae521d33886c06505392103280f71075d2 ChangeLog 27066
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -179,7 +183,7 @@ SHA256 2b463c8ec2a6734ee0dbe32781c512bc5d4dd6e465101838d07ae00f0881058f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRvmmamhnQswr0vIRAk4kAJsFlW+iIhe7AVW+zypNZqJxUWA5dwCfb18/
-kkM9iogbQiGAWBNrAMz/Cis=
-=YTL7
+iD8DBQFFRv7GamhnQswr0vIRAlzWAJ0bUwDNKJI0sdeX/GqYBK6Uy0NYsgCfaQhx
+5MK0bjPqOhgPfn6CU2mNWmg=
+=35fS
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch b/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch
new file mode 100644 (file)
index 0000000..fb5ab38
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch
@@ -0,0 +1,53 @@
+newer kernel headers stop exporting _syscall#() macro's, so let's insert
+some workarounds to handle this ...
+
+util-linux-2.13 doesnt use _syscall#() anymore
+
+http://bugs.gentoo.org/150852
+
+--- lib/my-syscall.h
++++ lib/my-syscall.h
+@@ -0,0 +1,12 @@
++#ifndef __MY_SYSCALL_H__
++#define __MY_SYSCALL_H__
++
++#ifndef _syscall5
++# define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
++type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
++{ \
++      return (type) syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5); \
++}
++#endif
++
++#endif
+--- fdisk/llseek.c
++++ fdisk/llseek.c
+@@ -10,6 +10,8 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#include "my-syscall.h"
++
+ extern long long ext2_llseek (unsigned int, long long, unsigned int);
+ 
+ #ifdef __linux__
+--- fdisk/sfdisk.c
++++ fdisk/sfdisk.c
+@@ -177,6 +177,7 @@
+ #endif
+ 
+ #ifndef use_lseek
++#include <my-syscall.h>
+ static __attribute__used
+ _syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
+        loff_t *, res, unsigned int, wh);
+--- partx/partx.c
++++ partx/partx.c
+@@ -339,6 +339,7 @@
+ 
+ #ifdef NEED__llseek
+ #include <linux/unistd.h>       /* _syscall */
++#include "../lib/my-syscall.h"
+ static
+ _syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
+         long long *, res, uint, wh);

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 a2b1dfbaff24a62b8f784ddb240fea31c4d1a4f4..cabc8be4e0646d658cf05ebece92abc818e750ad 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-2006 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.1 2006/10/28 22:37:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r5.ebuild,v 1.2 2006/10/31 07:43:50 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -117,6 +117,8 @@ src_unpack() {
        # fix mips n32 (no llseek syscall)
        epatch "${FILESDIR}"/${PN}-2.12-mips-lseek.patch
 
+       epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852
+
        # Enable random features
        local mconfigs="MCONFIG"
        use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG"