Author: jajcus Date: Thu Apr 15 18:42:17 2010 GMT Module: packages Tag: HEAD ---- Log message: - trying to fix i486 spec – use 'zero' vm instead of hotspot
---- Files affected: packages/icedtea6: icedtea6.spec (1.20 -> 1.21) , icedtea6-i486.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/icedtea6/icedtea6.spec diff -u packages/icedtea6/icedtea6.spec:1.20 packages/icedtea6/icedtea6.spec:1.21 --- packages/icedtea6/icedtea6.spec:1.20 Thu Apr 15 19:18:27 2010 +++ packages/icedtea6/icedtea6.spec Thu Apr 15 20:42:12 2010 @@ -27,10 +27,13 @@ # 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 @@ -274,6 +277,7 @@ %prep %setup -q +%patch0 -p1 # let the build system extract the sources where it wants them mkdir drops @@ -284,6 +288,11 @@ %build unset JAVA_HOME || : + +%{__aclocal} +%{__autoconf} +%{__automake} + %configure \ %if %{with bootstrap} --with-gcj-home=%{_gcj_home} \ @@ -720,6 +729,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2010/04/15 18:42:12 jajcus +- trying to fix i486 spec – use 'zero' vm instead of hotspot + Revision 1.20 2010/04/15 17:18:27 jajcus - %files cleanup and jre-mozilla-plugin for a better dependency tree ================================================================ Index: packages/icedtea6/icedtea6-i486.patch diff -u /dev/null packages/icedtea6/icedtea6-i486.patch:1.1 --- /dev/null Thu Apr 15 20:42:17 2010 +++ packages/icedtea6/icedtea6-i486.patch Thu Apr 15 20:42:12 2010 @@ -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-*-*) ;; + *) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
