rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=71
This commit is contained in:
Tomáš Chvátal 2017-01-04 10:45:07 +00:00 committed by Git OBS Bridge
parent 6c92b0c81e
commit 1e0d7eb309
4 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ant-antlr.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant-antlr
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -23,6 +23,10 @@
%bcond_with junit
%bcond_without antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@ -31,10 +35,6 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant-antlr
Version: 1.9.6
Release: 0
@ -51,17 +51,12 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.5.0
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@ -74,7 +69,6 @@ BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -459,7 +453,6 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif

19
ant-junit.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant-junit
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -23,6 +23,10 @@
%bcond_without junit
%bcond_with antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@ -31,10 +35,6 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant-junit
Version: 1.9.6
Release: 0
@ -51,17 +51,12 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.5.0
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@ -74,7 +69,6 @@ BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -459,7 +453,6 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif

5
ant.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 4 10:44:04 UTC 2017 - tchvatal@suse.com
- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7
-------------------------------------------------------------------
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de

19
ant.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -22,6 +22,10 @@
%bcond_with junit
%bcond_with antlr
%global ant_home %{_datadir}/ant
%global major_version 1.9
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
%if %{_arch} != arm
@ -30,10 +34,6 @@
%global build_javadoc 0
%endif
%global ant_home %{_datadir}/ant
%global major_version 1.9
Name: ant
Version: 1.9.6
Release: 0
@ -50,17 +50,12 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.5.0
BuildRequires: javapackages-tools
BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if %{with junit} || %{with antlr}
@ -73,7 +68,6 @@ BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@ -458,7 +452,6 @@ ant javadocs
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
%endif