source: pkg/boss/main/virtualbox-ose/trunk/debian/patches/12-make-module.dpatch @ 4946

Revision 4946, 4.5 KB checked in by alanbach-guest, 5 years ago (diff)
  • Sync'd with Debian 2.1.2-dfsg-1
Line 
1#!/bin/sh /usr/share/dpatch/dpatch-run
2## 12-make-module.dpatch by Michael Meskes <meskes@debian.org>
3##
4## DP: Fix ARCH setting in modules Makefiles
5
6@DPATCH@
7
8diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/module/Makefile.module
9--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module      2008-12-13 23:00:20.000000000 +0100
10+++ virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/module/Makefile.module   2008-12-28 17:23:27.000000000 +0100
11@@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
12   BUILD_TARGET_ARCH := amd64
13  else
14   ifeq ($(ARCH),i386)
15-   BUILD_TARGET_ARCH := x86
16+   ifeq ($(CONFIG_X86_32),y)
17+     BUILD_TARGET_ARCH := x86
18+   else
19+     BUILD_TARGET_ARCH := amd64
20+   endif
21   else
22-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
23-    BUILD_TARGET_ARCH := amd64
24+   ifeq ($(ARCH),x86)
25+    ifeq ($(CONFIG_X86_32),y)
26+     BUILD_TARGET_ARCH := x86
27+    else
28+     BUILD_TARGET_ARCH := amd64
29+    endif
30    else
31-    BUILD_TARGET_ARCH := x86
32+    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
33+     BUILD_TARGET_ARCH := amd64
34+    else
35+     BUILD_TARGET_ARCH := x86
36+    endif
37    endif
38   endif
39  endif
40diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
41--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module       2008-12-13 23:00:20.000000000 +0100
42+++ virtualbox-ose-2.1.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module    2008-12-28 17:23:27.000000000 +0100
43@@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
44   BUILD_TARGET_ARCH := amd64
45  else
46   ifeq ($(ARCH),i386)
47-   BUILD_TARGET_ARCH := x86
48+   ifeq ($(CONFIG_X86_32),y)
49+     BUILD_TARGET_ARCH := x86
50+   else
51+     BUILD_TARGET_ARCH := amd64
52+   endif
53   else
54-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
55-    BUILD_TARGET_ARCH := amd64
56+   ifeq ($(ARCH),x86)
57+    ifeq ($(CONFIG_X86_32),y)
58+     BUILD_TARGET_ARCH := x86
59+    else
60+     BUILD_TARGET_ARCH := amd64
61+    endif
62    else
63-    BUILD_TARGET_ARCH := x86
64+    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
65+     BUILD_TARGET_ARCH := amd64
66+    else
67+     BUILD_TARGET_ARCH := x86
68+    endif
69    endif
70   endif
71  endif
72diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
73--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile  2008-12-13 23:00:17.000000000 +0100
74+++ virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile       2008-12-28 17:23:27.000000000 +0100
75@@ -43,12 +43,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
76   BUILD_TARGET_ARCH := amd64
77  else
78   ifeq ($(ARCH),i386)
79-   BUILD_TARGET_ARCH := x86
80+   ifeq ($(CONFIG_X86_32),y)
81+     BUILD_TARGET_ARCH := x86
82+   else
83+     BUILD_TARGET_ARCH := amd64
84+   endif
85   else
86-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
87-    BUILD_TARGET_ARCH := amd64
88+   ifeq ($(ARCH),x86)
89+    ifeq ($(CONFIG_X86_32),y)
90+     BUILD_TARGET_ARCH := x86
91+    else
92+     BUILD_TARGET_ARCH := amd64
93+    endif
94    else
95-    BUILD_TARGET_ARCH := x86
96+    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
97+     BUILD_TARGET_ARCH := amd64
98+    else
99+     BUILD_TARGET_ARCH := x86
100+    endif
101    endif
102   endif
103  endif
104diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
105--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile       2008-12-15 22:21:46.000000000 +0100
106+++ virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile    2008-12-28 17:23:49.000000000 +0100
107@@ -34,12 +34,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
108   BUILD_TARGET_ARCH := amd64
109  else
110   ifeq ($(ARCH),i386)
111-   BUILD_TARGET_ARCH := x86
112+   ifeq ($(CONFIG_X86_32),y)
113+     BUILD_TARGET_ARCH := x86
114+   else
115+     BUILD_TARGET_ARCH := amd64
116+   endif
117   else
118-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
119-    BUILD_TARGET_ARCH := amd64
120+   ifeq ($(ARCH),x86)
121+    ifeq ($(CONFIG_X86_32),y)
122+     BUILD_TARGET_ARCH := x86
123+    else
124+     BUILD_TARGET_ARCH := amd64
125+    endif
126    else
127-    BUILD_TARGET_ARCH := x86
128+    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
129+     BUILD_TARGET_ARCH := amd64
130+    else
131+     BUILD_TARGET_ARCH := x86
132+    endif
133    endif
134   endif
135  endif
Note: See TracBrowser for help on using the repository browser.