packages: icedtea6/icedtea6.spec - fix corba build by disabling -ljvm (not ...

[jajcus]

Author: jajcus                       Date: Wed Apr 14 12:56:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix corba build by disabling -ljvm (not needed there), proper path to printf. NFY

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.1 packages/icedtea6/icedtea6.spec:1.2
--- packages/icedtea6/icedtea6.spec:1.1	Wed Apr 14 11:53:49 2010
+++ packages/icedtea6/icedtea6.spec	Wed Apr 14 14:56:45 2010
@@ -67,6 +67,8 @@
 
 %prep
 %setup -q
+
+# let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
 ln -s %{SOURCE2} drops
@@ -85,13 +87,19 @@
 	--with-rhino=%{_javadir}/js.jar \
 	--disable-plugin
 
+%{__make} extract extract-ecj
+
+# Cannot do that as patch, as the sources are prepared by make
+%{__sed} -i -e's/CORBA_BUILD_ARGUMENTS = \\/CORBA_BUILD_ARGUMENTS = JVMLIB="" \\/' openjdk-ecj/make/corba-rules.gmk
+
 %{__make} -j1 \
-	SHELL=/bin/bash
+	PRINTF=/bin/printf
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	PRINTF=/bin/printf \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -106,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/14 12:56:45  jajcus
+- fix corba build by disabling -ljvm (not needed there), proper path to printf. NFY
+
 Revision 1.1  2010/04/14 09:53:49  jajcus
 - new package, the stable release of IcedTes, based on icedtea.spec, NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.1&r2=1.2&f=u