Accepting request 526034 from Java:packages
Fix bootstrap build with javac that is option-compatiblew with openjdk OBS-URL: https://build.opensuse.org/request/show/526034 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b2584885d7
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Allow bootstrapping with something else then
|
||||
java-1_5_0-gcj-compat, but still require
|
||||
java-1_5_0-gcj-compat-devel
|
||||
- Added patch:
|
||||
* apache-ant-bootstrap.patch
|
||||
- Add -sourcepath option to fix build breakages with Eclipse
|
||||
Compiler for Java(tm)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
||||
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
|
||||
Patch3: reproducible.patch
|
||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||
Patch5: apache-ant-bootstrap.patch
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
||||
#!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
|
||||
#BuildRequires: java-devel >= 1.5
|
||||
BuildConflicts: java-devel >= 1.9
|
||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
@ -354,6 +354,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
|
||||
%if ! %{with bootstrap}
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
|
||||
# clean jar files
|
||||
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
|
||||
@ -394,8 +395,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
||||
%if %{with bootstrap}
|
||||
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"
|
||||
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
|
||||
sh -x ./build.sh --noconfig jars
|
||||
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Allow bootstrapping with something else then
|
||||
java-1_5_0-gcj-compat, but still require
|
||||
java-1_5_0-gcj-compat-devel
|
||||
- Added patch:
|
||||
* apache-ant-bootstrap.patch
|
||||
- Add -sourcepath option to fix build breakages with Eclipse
|
||||
Compiler for Java(tm)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
||||
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
|
||||
Patch3: reproducible.patch
|
||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||
Patch5: apache-ant-bootstrap.patch
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
||||
#!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
|
||||
#BuildRequires: java-devel >= 1.5
|
||||
BuildConflicts: java-devel >= 1.9
|
||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
@ -354,6 +354,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
|
||||
%if ! %{with bootstrap}
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
|
||||
# clean jar files
|
||||
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
|
||||
@ -394,8 +395,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
||||
%if %{with bootstrap}
|
||||
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"
|
||||
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
|
||||
sh -x ./build.sh --noconfig jars
|
||||
|
||||
%endif
|
||||
|
||||
11
ant.changes
11
ant.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Allow bootstrapping with something else then
|
||||
java-1_5_0-gcj-compat, but still require
|
||||
java-1_5_0-gcj-compat-devel
|
||||
- Added patch:
|
||||
* apache-ant-bootstrap.patch
|
||||
- Add -sourcepath option to fix build breakages with Eclipse
|
||||
Compiler for Java(tm)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
10
ant.spec
10
ant.spec
@ -43,11 +43,11 @@ Patch1: apache-ant-class-path-in-manifest.patch
|
||||
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
|
||||
Patch3: reproducible.patch
|
||||
Patch4: apache-ant-1.9.9-sourcetarget.patch
|
||||
Patch5: apache-ant-bootstrap.patch
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
|
||||
#!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
|
||||
#BuildRequires: java-devel >= 1.5
|
||||
BuildConflicts: java-devel >= 1.9
|
||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
@ -353,6 +353,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
|
||||
%if ! %{with bootstrap}
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
|
||||
# clean jar files
|
||||
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
|
||||
@ -393,8 +394,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
||||
%if %{with bootstrap}
|
||||
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"
|
||||
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
|
||||
sh -x ./build.sh --noconfig jars
|
||||
|
||||
%endif
|
||||
|
||||
12
apache-ant-bootstrap.patch
Normal file
12
apache-ant-bootstrap.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- apache-ant-1.9.9/bootstrap.sh 2017-02-02 18:55:08.000000000 +0100
|
||||
+++ apache-ant-1.9.9/bootstrap.sh 2017-09-14 09:10:47.071433171 +0200
|
||||
@@ -124,8 +124,7 @@
|
||||
mkdir -p bin
|
||||
|
||||
echo ... Compiling Ant Classes
|
||||
-
|
||||
-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
|
||||
+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
|
||||
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
|
||||
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
|
||||
${TOOLS}/ant/property/*.java \
|
||||
Loading…
x
Reference in New Issue
Block a user