← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/openjdk-6/intrepid-updates

« back to all changes in this revision

Viewing changes to patches/icedtea-uname.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-07-31 15:24:59 UTC
  • Revision ID: james.westby@ubuntu.com-20080731152459-wgmbru39ayke4qc6
Tags: 6b11-3ubuntu1
Merge with Debian; regenerate the control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/icedtea-uname.patch
 
1
--- openjdk/jdk/make/common/shared/Platform.gmk.orig    2008-07-26 17:21:17.441295678 +0200
 
2
+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-07-26 17:30:24.589549285 +0200
 
3
@@ -191,6 +191,9 @@
 
4
   OS_VERSION := $(shell uname -r)
 
5
   # Arch and OS name/version
 
6
   mach := $(shell uname -m)
 
7
+  ifneq (,$(filter $(mach),mips s390 s390x))
 
8
+    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
 
9
+  endif
 
10
   archExpr = case "$(mach)" in \
 
11
                 i[3-9]86) \
 
12
                     echo i586 \
 
13
@@ -204,6 +207,9 @@
 
14
                 sparc*) \
 
15
                     echo sparc \
 
16
                     ;; \
 
17
+                arm*) \
 
18
+                    echo arm \
 
19
+                    ;; \
 
20
                 *) \
 
21
                     echo $(mach) \
 
22
                     ;; \
 
23
--- openjdk/corba/make/common/shared/Platform.gmk.orig  2008-07-26 17:21:17.441295678 +0200
 
24
+++ openjdk/corba/make/common/shared/Platform.gmk       2008-07-26 17:30:22.059511120 +0200
 
25
@@ -181,6 +181,9 @@
 
26
   OS_VERSION := $(shell uname -r)
 
27
   # Arch and OS name/version
 
28
   mach := $(shell uname -m)
 
29
+  ifneq (,$(filter $(mach),mips s390 s390x))
 
30
+    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
 
31
+  endif
 
32
   archExpr = case "$(mach)" in \
 
33
                 i[3-9]86) \
 
34
                     echo i586 \
 
35
@@ -194,6 +197,9 @@
 
36
                 sparc*) \
 
37
                     echo sparc \
 
38
                     ;; \
 
39
+                arm*) \
 
40
+                    echo arm \
 
41
+                    ;; \
 
42
                 *) \
 
43
                     echo $(mach) \
 
44
                     ;; \