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

[doko at ubuntu.com]

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

	        * patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.

diffstat:

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

diffs (32 lines):

diff -r 92b3adc8a186 -r 28203509220a ChangeLog
--- a/ChangeLog	Mon Nov 10 14:48:22 2008 -0500
+++ b/ChangeLog	Tue Nov 11 08:45:14 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-10  Omair Majid  <omajid at redhat.
+2008-11-11  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
+
 2008-11-10  Omair Majid  <omajid at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
diff -r 92b3adc8a186 -r 28203509220a patches/icedtea-uname.patch
--- a/patches/icedtea-uname.patch	Mon Nov 10 14:48:22 2008 -0500
+++ b/patches/icedtea-uname.patch	Tue Nov 11 08:45:14 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))
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
 +  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))
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
 +  endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \