Attachment 7282 Details for Bug 34219 – патч для сборки с ecj-gcj

[patch] патч для сборки с ecj-gcj

gcc4.5.spec--ecj-gcj.patch (text/plain), 1.92 KB, created by viy on 2017-11-18 23:56:08 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: viy

Created: 2017-11-18 23:56:08 MSK

Size: 1.92 KB

patch

obsolete

>diff --git a/gcc4.spec b/gcc4.spec
>index 160bea7..0fe0162 100644
>--- a/gcc4.spec
>+++ b/gcc4.spec
>@@ -170,7 +170,7 @@ BuildPreReq: makeinfo
> # due to manpages
> BuildPreReq: perl-Pod-Parser
> %{?_with_ada:BuildPreReq: gcc-gnat}
>-%{?_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}
>+%{?_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}
> %{?_with_objc:%{?_enable_objc_gc:BuildPreReq: libgc-devel}}
> %{?_enable_doxygen:BuildPreReq: doxygen graphviz tetex-latex}
> %{?_with_pdf:BuildPreReq: tetex-dvips}
>@@ -642,7 +642,7 @@ Requires: %name = %version-%release, libgcj%gcc_branch-devel = %version-%release
> # GC Warning: GC_get_nprocs() returned -1
> # Couldn't read /proc/self/stat
> Requires: /proc
>-Requires: /usr/share/java/ecj.jar
>+Requires: /usr/share/java/ecj-gcj.jar
> 
> %description java
> This package adds support for compiling Java(tm) programs and
>@@ -913,7 +913,7 @@ mkdir java_hacks
> pushd java_hacks
> cat >ecj1 <<EOF
> #!/bin/sh
>-exec gij -cp /usr/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
>+exec gij -cp /usr/share/java/ecj-gcj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
> EOF
> chmod +x ecj1
> export PATH=`pwd`${PATH:+:$PATH}
>@@ -955,7 +955,7 @@ export CC=%__cc \
> %if_with java
> 	--enable-java-awt=gtk \
> 	--with-native-libdir=%_libdir/gcj%psuffix \
>-	--with-ecj-jar=/usr/share/java/ecj.jar \
>+	--with-ecj-jar=/usr/share/java/ecj-gcj.jar \
> 	--with-java-home=%_prefix/lib/jvm/java-1.5.0-gcj%psuffix-1.5.0.0/jre \
> 	--enable-libgcj-multifile \
> 	--disable-libjava-multilib \

Actions: View | Diff

Attachments on bug 34219: 7282