Don't build with gcj and fix jdk9 build
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=28
This commit is contained in:
parent
ec50d1b7cf
commit
05499505af
11
bcel-5.2-encoding.patch
Normal file
11
bcel-5.2-encoding.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- bcel-5.2/build.xml 2017-09-27 18:59:57.110434113 +0200
|
||||||
|
+++ bcel-5.2/build.xml 2017-09-27 19:00:39.286692143 +0200
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
<target name="compile" description="o Compile the code" depends="get-deps">
|
||||||
|
<mkdir dir="${classesdir}">
|
||||||
|
</mkdir>
|
||||||
|
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
||||||
|
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" encoding="ISO-8859-1" excludes="**/package.html">
|
||||||
|
<src>
|
||||||
|
<pathelement location="src/java">
|
||||||
|
</pathelement>
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 27 17:05:58 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Allow building with any java-devel provider
|
||||||
|
- Specify java source and target level 1.6 to fix build with jdk9
|
||||||
|
- Added patch:
|
||||||
|
* bcel-5.2-encoding.patch
|
||||||
|
+ specify the correct encoding of the files
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 19 16:56:30 UTC 2017 - tchvatal@suse.com
|
Fri May 19 16:56:30 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
22
bcel.spec
22
bcel.spec
@ -26,17 +26,10 @@ Url: http://commons.apache.org/proper/commons-bcel/
|
|||||||
Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz
|
Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz
|
||||||
Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc
|
Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc
|
||||||
Source2: bcel.keyring
|
Source2: bcel.keyring
|
||||||
|
Patch0: bcel-5.2-encoding.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: regexp
|
BuildRequires: regexp
|
||||||
#BuildRequires: xerces-j2-bootstrap
|
|
||||||
#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2
|
|
||||||
#!BuildIgnore: xml-commons-jaxp-1.3-apis
|
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
|
||||||
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
|
|
||||||
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
|
|
||||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel
|
|
||||||
#!BuildIgnore: xerces-j2-bootstrap
|
|
||||||
BuildRequires: xml-commons-apis-bootstrap
|
BuildRequires: xml-commons-apis-bootstrap
|
||||||
Requires: regexp
|
Requires: regexp
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -66,6 +59,7 @@ standard JVM message.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
# remove all binary libs
|
# remove all binary libs
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
# very broken build
|
# very broken build
|
||||||
@ -75,8 +69,14 @@ touch manifest.txt
|
|||||||
%build
|
%build
|
||||||
export CLASSPATH=%(build-classpath regexp)
|
export CLASSPATH=%(build-classpath regexp)
|
||||||
export OPT_JAR_LIST="ant/ant-nodeps"
|
export OPT_JAR_LIST="ant/ant-nodeps"
|
||||||
ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile
|
ant \
|
||||||
ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar
|
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
|
||||||
|
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
|
||||||
|
compile
|
||||||
|
ant \
|
||||||
|
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
|
||||||
|
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
|
||||||
|
jar
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jars
|
# jars
|
||||||
|
Loading…
x
Reference in New Issue
Block a user