Mercurial > hg > release > icedtea6-1.8

changeset 1158:55a7a736bf3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-10-27 Matthias Klose <doko@ubuntu.com> * patches/icedtea-uname.dpatch: Only call dpkg-architecture if it is available.
author doko@ubuntu.com
date Mon, 27 Oct 2008 12:05:29 +0100
parents 7b4e0145155d
children fda32eba4b37
files ChangeLog patches/icedtea-uname.patch
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Oct 25 23:23:16 2008 +0200
+++ b/ChangeLog	Mon Oct 27 12:05:29 2008 +0100
@@ -1,3 +1,8 @@
+2008-10-27  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-uname.dpatch: Only call dpkg-architecture if it is
+	available.
+
 2008-10-25  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (clean-pulse-java): Remove object files.
--- a/patches/icedtea-uname.patch	Sat Oct 25 23:23:16 2008 +0200
+++ b/patches/icedtea-uname.patch	Mon Oct 27 12:05:29 2008 +0100
@@ -1,10 +1,10 @@
---- openjdk/jdk/make/common/shared/Platform.gmk.orig	2008-07-26 17:21:17.441295678 +0200
-+++ openjdk/jdk/make/common/shared/Platform.gmk	2008-07-26 17:30:24.589549285 +0200
+--- openjdk/jdk/make/common/shared/Platform.gmk.orig	2008-10-27 11:44:47.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk	2008-10-27 11:52:17.000000000 +0100
 @@ -191,6 +191,9 @@
    OS_VERSION := $(shell uname -r)
    # Arch and OS name/version
    mach := $(shell uname -m)
-+  ifneq (,$(filter $(mach),mips s390 s390x))
++  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
 +    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
 +  endif
    archExpr = case "$(mach)" in \
@@ -20,13 +20,13 @@
                  *) \
                      echo $(mach) \
                      ;; \
---- openjdk/corba/make/common/shared/Platform.gmk.orig	2008-07-26 17:21:17.441295678 +0200
-+++ openjdk/corba/make/common/shared/Platform.gmk	2008-07-26 17:30:22.059511120 +0200
+--- openjdk/corba/make/common/shared/Platform.gmk.orig	2008-10-27 11:44:47.000000000 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk	2008-10-27 11:53:01.000000000 +0100
 @@ -181,6 +181,9 @@
    OS_VERSION := $(shell uname -r)
    # Arch and OS name/version
    mach := $(shell uname -m)
-+  ifneq (,$(filter $(mach),mips s390 s390x))
++  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
 +    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
 +  endif
    archExpr = case "$(mach)" in \