diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-26 09:15:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-26 09:15:47 +0000 |
| commit | 6c72056f580c12d6ab2ab342d9469eaf450172af (patch) | |
| tree | 4eb9b58eb5404ebbc601f2c909105f0a073cb32a | |
| parent | 75ef4943bef9936f7f95c185d1c3d2f9b1532688 (diff) | |
| download | aports-6c72056f580c12d6ab2ab342d9469eaf450172af.tar.bz2 aports-6c72056f580c12d6ab2ab342d9469eaf450172af.tar.xz | |
main/open-vm-tools-grsec: fix build for x86
| -rw-r--r-- | main/open-vm-tools-grsec/APKBUILD | 6 | ||||
| -rw-r--r-- | main/open-vm-tools-grsec/gcc5-x86.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 830ee3eb5d..87fb222fc9 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -33,7 +33,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" -arch="x86_64" +arch="x86 x86_64" license="LGPL" subpackages="" depends="linux-${_flavor}=${_kernelver}" @@ -42,6 +42,7 @@ makedepends="$depends_dev autoconf automake libtool linux-headers" source="http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-${_realver%_p*}/open-vm-tools-${_ver}.tar.gz 0001-Fix-vmxnet-module-on-kernels-3.16.patch 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch + gcc5-x86.patch vmware-modules.initd " @@ -93,12 +94,15 @@ package() { md5sums="d19439b499f0cbc7001e0cc65aa1a5a7 open-vm-tools-9.10.0-2476743.tar.gz 3254b99481cea970acd6d65863ce6b48 0001-Fix-vmxnet-module-on-kernels-3.16.patch c0d137a271fc987024efbea698602681 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch +77a5208f4f34bd329232bddf034add91 gcc5-x86.patch 468a05614187bef0664c238811e7fae9 vmware-modules.initd" sha256sums="e146ad53d744d7793ee72c5271fc49a916613534c14827c227fdaef4b3579c96 open-vm-tools-9.10.0-2476743.tar.gz 85be67ed9827e685d55dd5cba25144d95296159ff1be73f491b343c395dd6a7d 0001-Fix-vmxnet-module-on-kernels-3.16.patch d3dfe8f5af380afb9b32a1916a6b1e296ad3a55d1db7ac21fa7a3c35ce2d248a 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch +6bde59df244d21410a90727974d844b258221757ef5d6b43577d1ebda95ea95f gcc5-x86.patch 67217fb71ffceb3eed2a55ae47fe1411f67a0bf4563b86741768dc6d77f82760 vmware-modules.initd" sha512sums="8c8e4a559c0374e020c8261d4c8f6855efbe3f509745ee02ec03ab9ebce7e1327ec1e5e18f674cb464630ace9dc33b4262ffd119fc237c286ee44327e4590385 open-vm-tools-9.10.0-2476743.tar.gz c445631b7faf8badfbf8e66518bfb70aec1049c1a0393ff038253e70190d7f8580cbcd3e7037c43664ee0ee48d26edd8f8eaca06383bbd7fa763a182050f9551 0001-Fix-vmxnet-module-on-kernels-3.16.patch bb063ca0aac0a76633eec2878197ae977f48523da79afcd6e5b25a8d199fbc13247ea23a106ca5d44473881ad814c175084c28af7d344e83ed0e4b9321e4d6c3 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch +b603fe8531518bed4750f0a274ac500c99d8998fb8ec30359a0263d148e710c55694114c4ac48aa1bf1ec888c9472bed7ae1665eb05f577cc449c30855b88014 gcc5-x86.patch aa3524324274413ae016ba2e660bdab5c2bc95712c131cadd99fdb463ad30279b6b80e5b61eb002fedf348e56fb31586e2695d8be0c52e5c7fcb4a15f275985f vmware-modules.initd" diff --git a/main/open-vm-tools-grsec/gcc5-x86.patch b/main/open-vm-tools-grsec/gcc5-x86.patch new file mode 100644 index 0000000000..6fbaff0a8d --- /dev/null +++ b/main/open-vm-tools-grsec/gcc5-x86.patch @@ -0,0 +1,13 @@ +http://sourceforge.net/p/open-vm-tools/mailman/message/34016246/ + +--- ./lib/include/vm_basic_asm_x86.h.orig ++++ ./lib/include/vm_basic_asm_x86.h +@@ -436,7 +436,7 @@ + #pragma warning(default: 4035) + #else + #define MUL64_NO_ASM 1 +-#include "mul64.h" ++//#include "mul64.h" + #endif + + /* |