changeset in /hg/icedtea6: 2008-12-07 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset cb878729b4ff in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cb878729b4ff
description:
	2008-12-07  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-uname.patch: Update for PARISC.

diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
ChangeLog                   |    4 ++++
patches/icedtea-uname.patch |    4 ++--

diffs (32 lines):

diff -r 0623a28ecba1 -r cb878729b4ff ChangeLog
--- a/ChangeLog	Fri Dec 05 18:30:11 2008 +0100
+++ b/ChangeLog	Sun Dec 07 21:04:26 2008 +0100
@@ -1,3 +1,7 @@ 2008-12-05  Matthias Klose  <doko at ubuntu
+2008-12-07  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-uname.patch: Update for PARISC.
+
 2008-12-05  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-hotspot7-build-fixes.patch: Update.
diff -r 0623a28ecba1 -r cb878729b4ff patches/icedtea-uname.patch
--- a/patches/icedtea-uname.patch	Fri Dec 05 18:30:11 2008 +0100
+++ b/patches/icedtea-uname.patch	Sun Dec 07 21:04:26 2008 +0100
@@ -5,7 +5,7 @@
    # Arch and OS name/version
    mach := $(shell uname -m)
 +  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-+    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
 +  endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \
@@ -27,7 +27,7 @@
    # Arch and OS name/version
    mach := $(shell uname -m)
 +  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-+    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
 +  endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \