Mercurial > hg > release > icedtea6-1.4.1

changeset 1207:28203509220a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-11-11 Matthias Klose <doko@ubuntu.com> * patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
author doko@ubuntu.com
date Tue, 11 Nov 2008 08:45:14 +0100
parents 92b3adc8a186
children 89e71b641b8e
files ChangeLog patches/icedtea-uname.patch
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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-11  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
+
 2008-11-10  Omair Majid  <omajid@redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
--- 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) \