Author: arekm Date: Wed Nov 21 18:31:18 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- with java_sun it fails much later (on javax.ssl stuff) than with gcj
---- Files affected:
SPECS:
icedtea.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/icedtea.spec
diff -u SPECS/icedtea.spec:1.4 SPECS/icedtea.spec:1.5
--- SPECS/icedtea.spec:1.4 Wed Nov 21 18:33:57 2007
+++ SPECS/icedtea.spec Wed Nov 21 19:31:13 2007
@@ -2,6 +2,8 @@
# TODO:
# - fix bash substitution
#
+%bcond_with java_sun
+#
%define snap 20071121
Summary: OpenJDK and GNU Classpath code
SummarY(pl.UTF-8): Kod OpenJDK i GNU Classpath
@@ -41,6 +43,10 @@
BuildRequires: xorg-proto-xproto-devel
BuildRequires: xulrunner-devel
BuildRequires: zlib-devel
+%if %{with java_sun}
+BuildRequires: java-sun-jre
+BuildRequires: jpackage-utils
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -58,6 +64,8 @@
%prep
%setup -q -n %{name} -a1
+find . -name '*.gmk' -exec sed -i -e 's#^PRINTF.*=.*#PRINTF = /bin/printf#g'
"{}" ";"
+
%build
unset JAVA_HOME || :
%configure \
@@ -70,6 +78,7 @@
--with-openjdk-src=${PWD}/openjdk
%{__make} -j1 \
+ %{?with_java_sun:BOOTDIR=%{java_home}} \
SHELL=/bin/bash
%install
@@ -90,6 +99,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2007-11-21 18:31:13 arekm
+- with java_sun it fails much later (on javax.ssl stuff) than with gcj
+
Revision 1.4 2007-11-21 17:33:57 arekm
- doesn't bootstrap; requires newer gcj than the one in gcc 4.2.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/icedtea.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
