View | Details | Raw Unified | Return to bug 34219
Collapse All | Expand All

(-)a/gcc4.spec (-4 / +4 lines)
Lines 170-176 BuildPreReq: makeinfo Link Here
170
# due to manpages
170
# due to manpages
171
BuildPreReq: perl-Pod-Parser
171
BuildPreReq: perl-Pod-Parser
172
%{?_with_ada:BuildPreReq: gcc-gnat}
172
%{?_with_ada:BuildPreReq: gcc-gnat}
173
%{?_with_java:BuildPreReq: %{?_without_java_bootstrap: jdkgcj} /usr/share/java/ecj.jar fastjar imake libXext-devel libXt-devel libXtst-devel libalsa-devel libart_lgpl-devel libgtk+2-devel libltdl-devel sharutils xorg-cf-files xorg-inputproto-devel unzip zip zlib-devel}
173
%{?_with_java:BuildPreReq: %{?_without_java_bootstrap: jdkgcj} /usr/share/java/ecj-gcj.jar fastjar imake libXext-devel libXt-devel libXtst-devel libalsa-devel libart_lgpl-devel libgtk+2-devel libltdl-devel sharutils xorg-cf-files xorg-inputproto-devel unzip zip zlib-devel}
174
%{?_with_objc:%{?_enable_objc_gc:BuildPreReq: libgc-devel}}
174
%{?_with_objc:%{?_enable_objc_gc:BuildPreReq: libgc-devel}}
175
%{?_enable_doxygen:BuildPreReq: doxygen graphviz tetex-latex}
175
%{?_enable_doxygen:BuildPreReq: doxygen graphviz tetex-latex}
176
%{?_with_pdf:BuildPreReq: tetex-dvips}
176
%{?_with_pdf:BuildPreReq: tetex-dvips}
Lines 642-648 Requires: %name = %version-%release, libgcj%gcc_branch-devel = %version-%release Link Here
642
# GC Warning: GC_get_nprocs() returned -1
642
# GC Warning: GC_get_nprocs() returned -1
643
# Couldn't read /proc/self/stat
643
# Couldn't read /proc/self/stat
644
Requires: /proc
644
Requires: /proc
645
Requires: /usr/share/java/ecj.jar
645
Requires: /usr/share/java/ecj-gcj.jar
646
646
647
%description java
647
%description java
648
This package adds support for compiling Java(tm) programs and
648
This package adds support for compiling Java(tm) programs and
Lines 913-919 mkdir java_hacks Link Here
913
pushd java_hacks
913
pushd java_hacks
914
cat >ecj1 <<EOF
914
cat >ecj1 <<EOF
915
#!/bin/sh
915
#!/bin/sh
916
exec gij -cp /usr/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
916
exec gij -cp /usr/share/java/ecj-gcj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
917
EOF
917
EOF
918
chmod +x ecj1
918
chmod +x ecj1
919
export PATH=`pwd`${PATH:+:$PATH}
919
export PATH=`pwd`${PATH:+:$PATH}
Lines 955-961 export CC=%__cc \ Link Here
955
%if_with java
955
%if_with java
956
	--enable-java-awt=gtk \
956
	--enable-java-awt=gtk \
957
	--with-native-libdir=%_libdir/gcj%psuffix \
957
	--with-native-libdir=%_libdir/gcj%psuffix \
958
	--with-ecj-jar=/usr/share/java/ecj.jar \
958
	--with-ecj-jar=/usr/share/java/ecj-gcj.jar \
959
	--with-java-home=%_prefix/lib/jvm/java-1.5.0-gcj%psuffix-1.5.0.0/jre \
959
	--with-java-home=%_prefix/lib/jvm/java-1.5.0-gcj%psuffix-1.5.0.0/jre \
960
	--enable-libgcj-multifile \
960
	--enable-libgcj-multifile \
961
	--disable-libjava-multilib \
961
	--disable-libjava-multilib \

Return to bug 34219