summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-03-21 15:57:36 +0000
committerMike Auty <ikelos@gentoo.org>2006-03-21 15:57:36 +0000
commitead13d118597a07ef33cc6e2b3d951d0e1788d2a (patch)
tree0e1511d6cef82479813456fd70d5ae96850d3b45 /app-emulation
parentUpdate vmware-server's config file with Hannes' patch, vmware-authd should no... (diff)
downloadvmware-ead13d118597a07ef33cc6e2b3d951d0e1788d2a.tar.gz
vmware-ead13d118597a07ef33cc6e2b3d951d0e1788d2a.tar.bz2
vmware-ead13d118597a07ef33cc6e2b3d951d0e1788d2a.zip
Ensure that the vmware-server-modules gcc4 patch is only applied if we're using gcc4.
svn path=/trunk/; revision=15
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-server-modules/Manifest6
-rw-r--r--app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild6
2 files changed, 7 insertions, 5 deletions
diff --git a/app-emulation/vmware-server-modules/Manifest b/app-emulation/vmware-server-modules/Manifest
index 51ea62b..5138ee8 100644
--- a/app-emulation/vmware-server-modules/Manifest
+++ b/app-emulation/vmware-server-modules/Manifest
@@ -7,6 +7,6 @@ SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/vm
MD5 adcad68386a2f83052102dc6798ec5b1 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
RMD160 dbb5a1608a0387a0820f6e872497782c92a1fb96 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
SHA256 41802b0831b12982b3166551ac3b6fdcce512aee7230ca1f71863511e4bbd697 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
-MD5 84ad3e5e5c696c19096bfb857447cee5 vmware-server-modules-1.0.0.22088.ebuild 1387
-RMD160 06b27bf542a2fd49733ca4350358ba249273910e vmware-server-modules-1.0.0.22088.ebuild 1387
-SHA256 886b68da857088fedbc19f6eea1592a7e7d0185c1d118c683f47061e294052e5 vmware-server-modules-1.0.0.22088.ebuild 1387
+MD5 dcafa09ca0547e198997a9b2c481940c vmware-server-modules-1.0.0.22088.ebuild 1452
+RMD160 8194339c13ba0e7372ebd208854f1dfb847e6936 vmware-server-modules-1.0.0.22088.ebuild 1452
+SHA256 cc2fbe84a03aa1ac1d51d05105933694591806bb82122d0e04d0073aac05ba48 vmware-server-modules-1.0.0.22088.ebuild 1452
diff --git a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
index 5a3e9aa..8f9a645 100644
--- a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit linux-mod eutils versionator
+inherit linux-mod eutils versionator toolchain-funcs
PARENT_PN=${PN/-modules/}
MY_PV="e.x.p-$(get_version_component_range 4)"
@@ -45,7 +45,9 @@ src_unpack() {
unpack ./${PARENT_PN}-distrib/lib/modules/source/${dir}.tar
cd ${S}/${dir}-only
epatch ${FILESDIR}/${P}-makefile.patch
- epatch ${FILESDIR}/${P}-makefile2.patch
+ if [ $(gcc-major-version) == "4" ]; then
+ epatch ${FILESDIR}/${P}-makefile2.patch
+ fi
convert_to_m ${S}/${dir}-only/Makefile
done