Mercurial > hg > release > icedtea6-1.4

changeset 1264:cb878729b4ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-12-07 Matthias Klose <doko@ubuntu.com> * patches/icedtea-uname.patch: Update for PARISC.
author doko@ubuntu.com
date Sun, 07 Dec 2008 21:04:26 +0100
parents 0623a28ecba1
children e80c09b99b46
files ChangeLog patches/icedtea-uname.patch
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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-07  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-uname.patch: Update for PARISC.
+
 2008-12-05  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/icedtea-hotspot7-build-fixes.patch: Update.
--- 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) \