Fix building with newer kernels #146004.

Package-Manager: portage-2.1.2_rc3-r5

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index b8c702ae07387c230b6063fbdad294ffc1c33c56..337d0e10bb09e2085d0752e6533cba5d0577b4d5 100644 (file)
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.14 2006/12/01 17:00:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.15 2006/12/17 01:51:25 vapier Exp $
+
+  17 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/patches/010_all_makefile-vm-build-no-unused-warnings.patch,
+  +files/patches/020_all_epoll-def-warnings.patch:
+  Fix building with newer kernels #146004.
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-modules-1.0.0.15-r1.ebuild:

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index c55e677ae965f955e781e3aa9687326c7a25186b..940a59959f20f3c974177872a6676b563bbf6196 100644 (file)
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -9,6 +9,14 @@ AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681ff
 MD5 d2a8db48485977f21067a20798219821 files/patches/000_all_makefile-include-directory.patch 342
 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 files/patches/000_all_makefile-include-directory.patch 342
 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db files/patches/000_all_makefile-include-directory.patch 342
+AUX patches/010_all_makefile-vm-build-no-unused-warnings.patch 407 RMD160 38deb7f5697f16eedbe4c5470cbd21ca84802011 SHA1 e3a4255077e9b44a6e42114f9d30bcde8b7d588b SHA256 6e62697c6b17a2c0cc80b4bdeb06c32afa9960e6ef5f7254f2a54d1a762069b0
+MD5 56bae6429e200d45fce02c626ba060ce files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+RMD160 38deb7f5697f16eedbe4c5470cbd21ca84802011 files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+SHA256 6e62697c6b17a2c0cc80b4bdeb06c32afa9960e6ef5f7254f2a54d1a762069b0 files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521
+MD5 58b71f6120139172fa6065ab7a2a691d files/patches/020_all_epoll-def-warnings.patch 435
+RMD160 b9152d9af93862c99c72abc1ef97639351d82141 files/patches/020_all_epoll-def-warnings.patch 435
+SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 files/patches/020_all_epoll-def-warnings.patch 435
 DIST VMware-server-1.0.1-29996.tar.gz 105500734 RMD160 f4d5805a230afd45ee2234065ffc7c172dd12e18 SHA1 d5e9719fe6dcfef7f13b7e91e31c51905bbeab60 SHA256 08cfa19d9e5475fdaf12114d99bdeecacfd703dd3ec129958bf6f7e98d11641b
 DIST vmware-any-any-update105.tar.gz 296970 RMD160 5da1b91c81ff1023c8f4dbc3ae02f7f180785e67 SHA1 179812c0750f450754b82fbc0f57e44dd2b84945 SHA256 568939479294b4200e667ec0e3ad0d24f0e37356ccb3267b21de803530694426
 EBUILD vmware-modules-1.0.0.11-r1.ebuild 311 RMD160 c1022016ab270313119855fe76745f9e5411ef26 SHA1 3f4408471a775cc68d2401808f2b8bec4f950cd7 SHA256 7a8c427e8c4c55feb3ff87d7085938373bd9154e771cc8ba2ee969eb0cd771cb
@@ -35,10 +43,10 @@ EBUILD vmware-modules-1.0.0.15.ebuild 755 RMD160 258807a4988214003151ff2e389345a
 MD5 97a3bb499e1aa9e5c2be27c189c0e318 vmware-modules-1.0.0.15.ebuild 755
 RMD160 258807a4988214003151ff2e389345aef3871aa5 vmware-modules-1.0.0.15.ebuild 755
 SHA256 a8ed9822f9045ddde9cd168d7b151b7162b1487fc6aba9a77385b1d25ab6b964 vmware-modules-1.0.0.15.ebuild 755
-MISC ChangeLog 3477 RMD160 57fdf290bbef20740da6e330e97cef5cdf654ce3 SHA1 4bfd159d110ee38ad29d9b89f3f0f00a5477e39d SHA256 91a05b9b23f985eeb553c8e891677eee5f6d4db11fbeb5c5d08b14980509bbac
-MD5 4cd399f3d6368606ab248d54d7117a7f ChangeLog 3477
-RMD160 57fdf290bbef20740da6e330e97cef5cdf654ce3 ChangeLog 3477
-SHA256 91a05b9b23f985eeb553c8e891677eee5f6d4db11fbeb5c5d08b14980509bbac ChangeLog 3477
+MISC ChangeLog 3689 RMD160 cc3193402c60061bb62b28196940d9998961ac5a SHA1 b5b63df7660b45ccdc352cc750702e21bf537323 SHA256 01f89e1590995d9cdc9b49d05d7fd502450a1d8cd8c1b78a8c74947c9caa48c8
+MD5 0bd1314b7eaf31ddb8fe21347924462a ChangeLog 3689
+RMD160 cc3193402c60061bb62b28196940d9998961ac5a ChangeLog 3689
+SHA256 01f89e1590995d9cdc9b49d05d7fd502450a1d8cd8c1b78a8c74947c9caa48c8 ChangeLog 3689
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
@@ -64,7 +72,7 @@ SHA256 cb9f8bdef0f77dbd2358a7059acb0e5cabbe62f7a489369e13fcfcbd370e08e1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFcF/WkT4lNIS36YERArXuAKDAYaBT9F2sf6sb3hVXOvabtLLsagCeNdbN
-H9rAsugVmBLkpBjJ3GNOyHo=
-=e8KB
+iD8DBQFFhKKmK9sYciBdMQMRAoPFAJ9f7lnUtuSNzOMyc7u001rPBOUr4gCbBHNm
+CMjE/cBF+10jebNsI5ZT5YM=
+=Fwo7
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch b/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch
new file mode 100644 (file)
index 0000000..a0c47d5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch
@@ -0,0 +1,11 @@
+--- Makefile.kernel
++++ Makefile.kernel
+@@ -14,7 +14,7 @@
+ endif
+ vm_check_build = $(shell if $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
+       $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default -DKBUILD_BASENAME= \
+-      -Werror -S -o /dev/null -xc $(1) \
++      -Werror -Wno-unused -S -o /dev/null -xc $(1) \
+       $(VMWARE_DEBUG_REDIRECT); then echo "$(2)"; else echo "$(3)"; fi)
+ 
+ CC_WARNINGS := -Wall -Wstrict-prototypes 

diff --git a/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch b/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch
new file mode 100644 (file)
index 0000000..c30d7c9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch
@@ -0,0 +1,18 @@
+--- include/compat_wait.h
++++ include/compat_wait.h
+@@ -34,13 +34,13 @@
+  * 2.4.20-wolk4.0s.
+  */
+ 
+-#if VMW_HAVE_EPOLL // {
++#ifdef VMW_HAVE_EPOLL // {
+ #define compat_poll_wqueues struct poll_wqueues
+ #else // } {
+ #define compat_poll_wqueues poll_table
+ #endif // }
+ 
+-#if VMW_HAVE_EPOLL // {
++#ifdef VMW_HAVE_EPOLL // {
+ 
+ /* If prototype does not match, build will abort here */
+ extern void poll_initwait(compat_poll_wqueues *);