1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
Description: Fix ARCH setting in modules Makefiles.
Author: Michael Meskes <meskes@debian.org>
Index: virtualbox/src/VBox/HostDrivers/Support/linux/Makefile
===================================================================
--- virtualbox.orig/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
@@ -44,9 +44,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
Index: virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
===================================================================
--- virtualbox.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
Index: virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
===================================================================
--- virtualbox.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
Index: virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile
===================================================================
--- virtualbox.orig/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
Index: virtualbox/src/VBox/Installer/linux/Makefile.include.header
===================================================================
--- virtualbox.orig/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
@@ -54,9 +54,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
|
