[packages/icedtea7: 23/103] - trying to fix i486 spec – use 'zero' vm instead of hotspot

[jajcus]

commit cb598d79bbd76ff121debfe6cc75a62dbdba1811
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Thu Apr 15 18:42:12 2010 +0000

    - trying to fix i486 spec – use 'zero' vm instead of hotspot
    
    Changed files:
        icedtea6-i486.patch -> 1.1
        icedtea6.spec -> 1.21

 icedtea6-i486.patch | 26 ++++++++++++++++++++++++++
 icedtea6.spec       |  9 +++++++++
 2 files changed, 35 insertions(+)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 9cd5f41..3717049 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -26,10 +26,13 @@ Source3:	http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_1
 # Source3-md5:	7a50bb540a27cdd0001885630088b758
 Source4:	https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
 # Source4-md5:	a2f7b972124cd776ff71e7754eb9a429
+Patch0:		%{name}-i486.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 %{!?with_bootstrap:BuildRequires:	ant}
 %{!?with_bootstrap:BuildRequires:	ant-nodeps}
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bash
 BuildRequires:	cups-devel
 BuildRequires:	freetype-devel >= 2.3
@@ -273,6 +276,7 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # let the build system extract the sources where it wants them
 mkdir drops
@@ -283,6 +287,11 @@ ln -s %{SOURCE4} drops
 
 %build
 unset JAVA_HOME || :
+
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+
 %configure \
 %if %{with bootstrap}
 	--with-gcj-home=%{_gcj_home} \
diff --git a/icedtea6-i486.patch b/icedtea6-i486.patch
new file mode 100644
index 0000000..b8af7fa
--- /dev/null
+++ b/icedtea6-i486.patch
@@ -0,0 +1,26 @@
+--- icedtea6-1.8/acinclude.m4.orig	2010-04-10 21:58:40.000000000 +0200
++++ icedtea6-1.8/acinclude.m4	2010-04-15 19:34:17.000000000 +0200
+@@ -8,6 +8,14 @@
+       CROSS_TARGET_ARCH=x86_64
+       ARCHFLAG="-m64"
+       ;;
++    i486)
++      BUILD_ARCH_DIR=i486
++      INSTALL_ARCH_DIR=i386
++      JRE_ARCH_DIR=i386
++      ARCH_PREFIX=${LINUX32}
++      CROSS_TARGET_ARCH=i386
++      ARCHFLAG="-m32"
++      ;;
+     i?86)
+       BUILD_ARCH_DIR=i586
+       INSTALL_ARCH_DIR=i386
+@@ -746,7 +754,7 @@
+       use_zero=yes;
+     else
+       case "${host}" in
+-        i?86-*-*) ;;
++        i[567]86-*-*) ;;
+         sparc*-*-*) ;;
+         x86_64-*-*) ;;
+         *)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf