This commit is contained in:
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Allow bootstrapping with something else then
|
||||||
|
java-1_5_0-gcj-compat
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@@ -45,10 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch3: reproducible.patch
|
Patch3: reproducible.patch
|
||||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
BuildRequires: java-devel >= 1.5
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
BuildConflicts: java-devel >= 1.9
|
||||||
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||||
%else
|
%else
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
@@ -395,7 +393,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
||||||
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Allow bootstrapping with something else then
|
||||||
|
java-1_5_0-gcj-compat
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@@ -45,10 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch3: reproducible.patch
|
Patch3: reproducible.patch
|
||||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
BuildRequires: java-devel >= 1.5
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
BuildConflicts: java-devel >= 1.9
|
||||||
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||||
%else
|
%else
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
@@ -395,7 +393,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
||||||
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Allow bootstrapping with something else then
|
||||||
|
java-1_5_0-gcj-compat
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
7
ant.spec
7
ant.spec
@@ -44,10 +44,8 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
|||||||
Patch3: reproducible.patch
|
Patch3: reproducible.patch
|
||||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
BuildRequires: java-devel >= 1.5
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
BuildConflicts: java-devel >= 1.9
|
||||||
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
|
|
||||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||||
%else
|
%else
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
@@ -394,7 +392,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
|
||||||
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
Reference in New Issue
Block a user