commit 96546287eb33fb91937ad488fa1b77dc0f2da941
Author: Jacek Konieczny <[email protected]>
Date: Wed Apr 14 12:56:45 2010 +0000
- fix corba build by disabling -ljvm (not needed there), proper path to
printf. NFY
Changed files:
icedtea6.spec -> 1.2
icedtea6.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 94b23b6..4256579 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -66,6 +66,8 @@ projektu GNU Classpath.
%prep
%setup -q
+
+# let the build system extract the sources where it wants them
mkdir drops
ln -s %{SOURCE1} .
ln -s %{SOURCE2} drops
@@ -84,13 +86,19 @@ unset JAVA_HOME || :
--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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
