From 0efd11248ad8cf3e04cc21250d2163a0b10204b1d990698ca4eddff715774bcd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 07:20:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=93 --- ant-antlr.changes | 4 ++++ ant-antlr.spec | 3 ++- ant-junit.changes | 4 ++++ ant-junit.spec | 3 ++- ant.changes | 4 ++++ ant.spec | 3 ++- apache-ant-bootstrap.patch | 12 ++++++++++++ 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 apache-ant-bootstrap.patch diff --git a/ant-antlr.changes b/ant-antlr.changes index b547f57..19b3c6d 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -4,6 +4,10 @@ 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 diff --git a/ant-antlr.spec b/ant-antlr.spec index deafa51..e981f54 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -44,6 +44,7 @@ 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 #BuildRequires: java-devel >= 1.5 @@ -353,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 @@ -393,7 +395,6 @@ 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="-source 1.5 -target 1.5" sh -x ./build.sh --noconfig jars diff --git a/ant-junit.changes b/ant-junit.changes index b547f57..19b3c6d 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -4,6 +4,10 @@ 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 diff --git a/ant-junit.spec b/ant-junit.spec index fb52e06..bab8934 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -44,6 +44,7 @@ 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 #BuildRequires: java-devel >= 1.5 @@ -353,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 @@ -393,7 +395,6 @@ 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="-source 1.5 -target 1.5" sh -x ./build.sh --noconfig jars diff --git a/ant.changes b/ant.changes index b547f57..19b3c6d 100644 --- a/ant.changes +++ b/ant.changes @@ -4,6 +4,10 @@ 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 diff --git a/ant.spec b/ant.spec index 0fca4d6..56ac62e 100644 --- a/ant.spec +++ b/ant.spec @@ -43,6 +43,7 @@ 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 #BuildRequires: java-devel >= 1.5 @@ -352,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 @@ -392,7 +394,6 @@ 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="-source 1.5 -target 1.5" sh -x ./build.sh --noconfig jars diff --git a/apache-ant-bootstrap.patch b/apache-ant-bootstrap.patch new file mode 100644 index 0000000..56b5906 --- /dev/null +++ b/apache-ant-bootstrap.patch @@ -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 \