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

[Gary Benson]

doko at ubuntu.com wrote:
> changeset 961aec1bb31b in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=961aec1bb31b
> description:
> 	2008-07-26  Matthias Klose  <doko at ubuntu.com>
> 
> 	        * patches/icedtea-arm-uname.patch: Rename to ...
> 	        * patches/icedtea-uname.patch: Fix architecture string for mipsel.
> 	        * patches/icedtea-zero.patch: Add support for alpha, m68k, mips{,el}.
> 	        * patches/icedtea-alpha-fixes.patch: New, fixes for alpha-linux.
> 	        * Makefile.am (ICEDTEA_PATCHES): Rename patch, add patch.
[snip]
> diff -r 94e809ed9e5b -r 961aec1bb31b patches/icedtea-uname.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/icedtea-uname.patch	Sat Jul 26 21:20:29 2008 +0200
> @@ -0,0 +1,44 @@
> +--- 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
> +@@ -191,6 +191,9 @@
> +   OS_VERSION := $(shell uname -r)
> +   # Arch and OS name/version
> +   mach := $(shell uname -m)
> ++  ifneq (,$(filter $(mach),mips s390 s390x))
> ++    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
> ++  endif
> +   archExpr = case "$(mach)" in \
> +                 i[3-9]86) \
> +                     echo i586 \
[snip]
> +--- 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
> +@@ -181,6 +181,9 @@
> +   OS_VERSION := $(shell uname -r)
> +   # Arch and OS name/version
> +   mach := $(shell uname -m)
> ++  ifneq (,$(filter $(mach),mips s390 s390x))
> ++    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
> ++  endif
> +   archExpr = case "$(mach)" in \
> +                 i[3-9]86) \
> +                     echo i586 \
> +@@ -194,6 +197,9 @@
> +                 sparc*) \
> +                     echo sparc \
> +                     ;; \
> ++                arm*) \
> ++                    echo arm \
> ++                    ;; \
> +                 *) \
> +                     echo $(mach) \
> +                     ;; \

These two will break Fedora s390 and s390x builds.  Can you make it
so that the conditional is only entered if /path/to/dpkg-architecture
exists?

Cheers,
Gary

-- 
http://gbenson.net/