summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-04-12 01:41:46 +0000
committerMike Auty <ikelos@gentoo.org>2006-04-12 01:41:46 +0000
commitb8c5099e5969928354bf1b12d9e29a36ec2228c6 (patch)
treeefadd4c4f3bd2fca17e7d0a01f2942bfd272cd77 /app-emulation
parentCorrect digests for recent vmware update. (diff)
downloadvmware-b8c5099e5969928354bf1b12d9e29a36ec2228c6.tar.gz
vmware-b8c5099e5969928354bf1b12d9e29a36ec2228c6.tar.bz2
vmware-b8c5099e5969928354bf1b12d9e29a36ec2228c6.zip
Patch to enable vmware-server-modules to compile under gcc-4.0.x.
svn path=/trunk/; revision=23
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-server-modules/Manifest15
-rw-r--r--app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile2.patch2
-rw-r--r--app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile3.patch12
-rw-r--r--app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22874.ebuild3
4 files changed, 25 insertions, 7 deletions
diff --git a/app-emulation/vmware-server-modules/Manifest b/app-emulation/vmware-server-modules/Manifest
index c23f238..3d5e054 100644
--- a/app-emulation/vmware-server-modules/Manifest
+++ b/app-emulation/vmware-server-modules/Manifest
@@ -4,9 +4,12 @@ SHA256 71d477f7f44b523d5965b7b68960a7aa6e1cb2b67975dc62c18f64cdb395d686 files/di
MD5 b90ff7e76d6c548c562b6bb276ad28ae files/vmware-server-modules-1.0.0.22874-makefile.patch 343
RMD160 d2f63ede9d9dbc6ec94ccede9177a5a15a678e62 files/vmware-server-modules-1.0.0.22874-makefile.patch 343
SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/vmware-server-modules-1.0.0.22874-makefile.patch 343
-MD5 adcad68386a2f83052102dc6798ec5b1 files/vmware-server-modules-1.0.0.22874-makefile2.patch 535
-RMD160 dbb5a1608a0387a0820f6e872497782c92a1fb96 files/vmware-server-modules-1.0.0.22874-makefile2.patch 535
-SHA256 41802b0831b12982b3166551ac3b6fdcce512aee7230ca1f71863511e4bbd697 files/vmware-server-modules-1.0.0.22874-makefile2.patch 535
-MD5 72f27c62ffab705bdd1dbcbc17e76f15 vmware-server-modules-1.0.0.22874.ebuild 1520
-RMD160 82e85654ccbe697570cbefac48efc65a0274555a vmware-server-modules-1.0.0.22874.ebuild 1520
-SHA256 1b5f3a872e06aa0cc259563e5eb9e74803f4e1ecc7b99fe7bd9fd6caf11fd4b0 vmware-server-modules-1.0.0.22874.ebuild 1520
+MD5 f92a736f7cfa0ce694aa335b1386aa0e files/vmware-server-modules-1.0.0.22874-makefile2.patch 519
+RMD160 316fcb4a4f0e7bdc588ca2542cc9a42032c13c7e files/vmware-server-modules-1.0.0.22874-makefile2.patch 519
+SHA256 3939f5a8a9d81d6e83ea58ee0825f7b16ebf5020332cfeb5c89bc874fe0491b9 files/vmware-server-modules-1.0.0.22874-makefile2.patch 519
+MD5 545a293505e5299343e62f6129092f88 files/vmware-server-modules-1.0.0.22874-makefile3.patch 547
+RMD160 d62874c5cfa1c0bf5d512c6edc5a27046c9dfd2d files/vmware-server-modules-1.0.0.22874-makefile3.patch 547
+SHA256 071664e97857eac62cbc1ed064632b172599f556cd37ea6b428834ef0c307f61 files/vmware-server-modules-1.0.0.22874-makefile3.patch 547
+MD5 0df711752ff270be5a12c8b66fb88934 vmware-server-modules-1.0.0.22874.ebuild 1542
+RMD160 558dc3e2316960441e45aa136f156895828b9e10 vmware-server-modules-1.0.0.22874.ebuild 1542
+SHA256 d6371139434fb456debaaf28f4054dc58e35e70c54786215e23aeee1b2c0ab2a vmware-server-modules-1.0.0.22874.ebuild 1542
diff --git a/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile2.patch b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile2.patch
index 2d9ec21..9fc39b2 100644
--- a/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile2.patch
+++ b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile2.patch
@@ -6,7 +6,7 @@ diff -uNr Makefile.kernel Makefile.kernel
vm_check_build = $(shell if $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
$(EXTRA_CFLAGS) -Iinclude2/asm/mach-default -DKBUILD_BASENAME=\"$(DRIVER)\" \
- -Werror -S -o /dev/null -xc $(1) \
-+ -Wno-unused -Wno-attributes -Werror -S -o /dev/null -xc $(1) \
++ -Wno-unused -Werror -S -o /dev/null -xc $(1) \
> /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi)
CC_WARNINGS := -Wall -Wstrict-prototypes
diff --git a/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile3.patch b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile3.patch
new file mode 100644
index 0000000..8aec729
--- /dev/null
+++ b/app-emulation/vmware-server-modules/files/vmware-server-modules-1.0.0.22874-makefile3.patch
@@ -0,0 +1,12 @@
+diff -uNr Makefile.kernel Makefile.kernel
+--- Makefile.kernel 2006-03-07 19:51:08.000000000 +0000
++++ Makefile.kernel 2006-03-17 13:58:14.000000000 +0000
+@@ -8,7 +8,7 @@
+
+ vm_check_build = $(shell if $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
+ $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default -DKBUILD_BASENAME=\"$(DRIVER)\" \
+- -Wno-unused -Werror -S -o /dev/null -xc $(1) \
++ -Wno-unused -Wno-attributes -Werror -S -o /dev/null -xc $(1) \
+ > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi)
+
+ CC_WARNINGS := -Wall -Wstrict-prototypes
diff --git a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22874.ebuild b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22874.ebuild
index e5c5fcf..22677e9 100644
--- a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22874.ebuild
+++ b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22874.ebuild
@@ -47,6 +47,9 @@ src_unpack() {
epatch ${FILESDIR}/${P}-makefile.patch
if [ $(gcc-major-version) == "4" ]; then
epatch ${FILESDIR}/${P}-makefile2.patch
+ if [ $(gcc-minor-version) != "0" ]; then
+ epatch ${FILESDIR}/${P}-makefile3.patch
+ fi
fi
convert_to_m ${S}/${dir}-only/Makefile
done