Author: jajcus Date: Sun May 21 15:27:15 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - do not use gcc-java by default. GIJ doesn't work well
---- Files affected: SPECS: antlr.spec (1.23.2.3 -> 1.23.2.4) ---- Diffs: ================================================================ Index: SPECS/antlr.spec diff -u SPECS/antlr.spec:1.23.2.3 SPECS/antlr.spec:1.23.2.4 --- SPECS/antlr.spec:1.23.2.3 Sun May 21 17:20:39 2006 +++ SPECS/antlr.spec Sun May 21 17:27:10 2006 @@ -5,7 +5,7 @@ # * Package the Emacs an Jedit modes # # Conditional build: -%bcond_with javac # use javac/java instead of gcj/gij (limits archs supported) +%bcond_with gcc_java # use gcj/gij instead of javac/java # Summary: ANother Tool for Language Recognition Summary(pl): Jeszcze jedno narzędzie do rozpoznawania języka @@ -21,7 +21,7 @@ BuildRequires: automake BuildRequires: libstdc++-devel BuildRequires: python -%if !%{with javac} +%if %{with gcc_java} BuildRequires: gcc-java BuildRequires: jar # gij is in gcc-java in Ac @@ -30,6 +30,7 @@ BuildRequires: jar BuildRequires: jdk Requires: jre +ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} %endif Conflicts: pccts < 1.33MR33-6 BuildRequires: sed >= 4.0 @@ -74,9 +75,9 @@ cp -f /usr/share/automake/config.sub scripts %configure \ - %{?with_javac:CLASSPATH=`pwd` --with-javac=javac} \ - %{!?with_javac:--with-javac=gcj} \ - %{!?with_javac:--with-java=gij} \ + %{?!with_gcc_java:CLASSPATH=`pwd` --with-javac=javac} \ + %{?without_gcc_java:--with-javac=gcj} \ + %{?without_gcc_java:--with-java=gij} \ --disable-csharp %{__make} @@ -126,6 +127,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23.2.4 2006/05/21 15:27:10 jajcus +- do not use gcc-java by default. GIJ doesn't work well + Revision 1.23.2.3 2006/05/21 15:20:39 jajcus - Always use "gij" to execute gcc-java version - explicit --disable-csharp, so csharp in build environment makes no difference ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/antlr.spec?r1=1.23.2.3&r2=1.23.2.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit