From 5efc8e24889f8d9cc8107a5bffbe20c6c0362f20db97bc480181960c170d648a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 05:40:44 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=90 --- ant-antlr.changes | 6 ++++++ ant-antlr.spec | 7 ++----- ant-junit.changes | 6 ++++++ ant-junit.spec | 7 ++----- ant.changes | 6 ++++++ ant.spec | 7 ++----- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index b9bd49d..79ab6c2 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -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 diff --git a/ant-antlr.spec b/ant-antlr.spec index ad5fa80..22054d2 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -45,10 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.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 @@ -395,7 +393,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 diff --git a/ant-junit.changes b/ant-junit.changes index b9bd49d..79ab6c2 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -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 diff --git a/ant-junit.spec b/ant-junit.spec index b17017c..c2ce70f 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -45,10 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.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 @@ -395,7 +393,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 diff --git a/ant.changes b/ant.changes index b9bd49d..79ab6c2 100644 --- a/ant.changes +++ b/ant.changes @@ -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 diff --git a/ant.spec b/ant.spec index fc5f7ad..5abe842 100644 --- a/ant.spec +++ b/ant.spec @@ -44,10 +44,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.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 @@ -394,7 +392,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 From de846836cb92cc38d569ddd6c3b8fa25861db7a299d0fd78541bfce723fe16d7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 05:53:04 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=91 --- ant-antlr.changes | 3 ++- ant-antlr.spec | 3 ++- ant-junit.changes | 3 ++- ant-junit.spec | 3 ++- ant.changes | 3 ++- ant.spec | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 79ab6c2..b547f57 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 22054d2..422b8fc 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -45,7 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else diff --git a/ant-junit.changes b/ant-junit.changes index 79ab6c2..b547f57 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant-junit.spec b/ant-junit.spec index c2ce70f..c4d92a8 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -45,7 +45,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else diff --git a/ant.changes b/ant.changes index 79ab6c2..b547f57 100644 --- a/ant.changes +++ b/ant.changes @@ -2,7 +2,8 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com - Allow bootstrapping with something else then - java-1_5_0-gcj-compat + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel ------------------------------------------------------------------- Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com diff --git a/ant.spec b/ant.spec index 5abe842..4bcb3c6 100644 --- a/ant.spec +++ b/ant.spec @@ -44,7 +44,8 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch %if %{with bootstrap} -BuildRequires: java-devel >= 1.5 +BuildRequires: java-1_5_0-gcj-compat-devel +#BuildRequires: java-devel >= 1.5 BuildConflicts: java-devel >= 1.9 #!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else From cd778b385e05abaab3a15f34a43e0fec02cf483688b8f109ba0ee9b5497c1578 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 06:02:30 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=92 --- ant-antlr.spec | 1 + ant-junit.spec | 1 + ant.spec | 1 + 3 files changed, 3 insertions(+) diff --git a/ant-antlr.spec b/ant-antlr.spec index 422b8fc..deafa51 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -394,6 +394,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 %endif diff --git a/ant-junit.spec b/ant-junit.spec index c4d92a8..fb52e06 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -394,6 +394,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 %endif diff --git a/ant.spec b/ant.spec index 4bcb3c6..0fca4d6 100644 --- a/ant.spec +++ b/ant.spec @@ -393,6 +393,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar 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 %endif From 0efd11248ad8cf3e04cc21250d2163a0b10204b1d990698ca4eddff715774bcd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 07:20:41 +0000 Subject: [PATCH 4/4] 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 \