Author: pluto Date: Thu Jun 19 18:29:18 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- testing alternative solution to avoid BC:jar...
---- Files affected:
SPECS:
gcc.spec (1.542 -> 1.543)
---- Diffs:
================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.542 SPECS/gcc.spec:1.543
--- SPECS/gcc.spec:1.542 Mon Jun 16 20:02:38 2008
+++ SPECS/gcc.spec Thu Jun 19 20:29:11 2008
@@ -71,9 +71,8 @@
Patch6: %{name}-ppc64-m32-m64-multilib-only.patch
Patch7: %{name}-libjava-multilib.patch
Patch8: %{name}-enable-java-awt-qt.patch
-Patch9: %{name}-force_jar_wrapper.patch
-Patch10: %{name}-hash-style-gnu.patch
-Patch11: %{name}-moresparcs.patch
+Patch9: %{name}-hash-style-gnu.patch
+Patch10: %{name}-moresparcs.patch
URL: http://gcc.gnu.org/
BuildRequires: autoconf
%{?with_tests:BuildRequires: autogen}
@@ -135,8 +134,6 @@
BuildRequires: qt4-build >= 4.0.1
%endif
%{?with_mozilla:BuildRequires: xulrunner-devel >= 1.8.1.3-1.20070321.5}
-# http://www.mailinglistarchive.com/java%40gcc.gnu.org/msg02751.html
-BuildConflicts: jar
%endif
Requires: binutils >= 2:2.17.50.0.9-1
Requires: libgcc = %{epoch}:%{version}-%{release}
@@ -1319,7 +1316,6 @@
%endif
%patch9 -p1
%patch10 -p1
-%patch11 -p1
mv ChangeLog ChangeLog.general
@@ -1340,6 +1336,8 @@
rm -rf builddir && install -d builddir && cd builddir
+# http://www.mailinglistarchive.com/java%40gcc.gnu.org/msg02751.html
+JAR=no \
CC="%{__cc}" \
CFLAGS="%{rpmcflags}" \
CXXFLAGS="%{rpmcxxflags}" \
@@ -2147,6 +2145,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.543 2008/06/19 18:29:11 pluto
+- testing alternative solution to avoid BC:jar...
+
Revision 1.542 2008/06/16 18:02:38 arekm
- BC jar only if building with java
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.542&r2=1.543&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
