[ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Guillermo Rodríguez]

Commit bbc978e623cafc added a patch intended to fix building
with OpenJDK 1.8, however that commit was not complete. It is
necessary to run autogen.sh so that the configure script is
regenerated and the patched m4 macros are used.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 patches/classpath-0.99/autogen.sh | 2 ++
 rules/classpath.in                | 1 +
 2 files changed, 3 insertions(+)
 create mode 100755 patches/classpath-0.99/autogen.sh

diff --git a/patches/classpath-0.99/autogen.sh b/patches/classpath-0.99/autogen.sh
new file mode 100755
index 0000000..9ca025f
--- /dev/null
+++ b/patches/classpath-0.99/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ./autogen.sh
diff --git a/rules/classpath.in b/rules/classpath.in
index 16017b2..271a917 100644
--- a/rules/classpath.in
+++ b/rules/classpath.in
@@ -5,6 +5,7 @@ config CLASSPATH
 	prompt "classpath"
 	select GCCLIBS_GCC_S
 	select HOST_SYSTEM_JDK
+	select HOST_GETTEXT
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU project to create
 	  free core class libraries for use with virtual machines and compilers
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Michael Olbrich]

On Fri, Nov 16, 2018 at 12:20:18PM +0100, Guillermo Rodríguez wrote:
> Commit bbc978e623cafc added a patch intended to fix building
> with OpenJDK 1.8, however that commit was not complete. It is
> necessary to run autogen.sh so that the configure script is
> regenerated and the patched m4 macros are used.
> 
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>

Unfortunately it's not that simple. The */Makefile.am also need the
1.5 -> 1.6 change. I tried that an then I get lots of errors like this:

warning: as of release 9, '_' is a keyword, and may not be used as an
identifier

Michael

> ---
>  patches/classpath-0.99/autogen.sh | 2 ++
>  rules/classpath.in                | 1 +
>  2 files changed, 3 insertions(+)
>  create mode 100755 patches/classpath-0.99/autogen.sh
> 
> diff --git a/patches/classpath-0.99/autogen.sh b/patches/classpath-0.99/autogen.sh
> new file mode 100755
> index 0000000..9ca025f
> --- /dev/null
> +++ b/patches/classpath-0.99/autogen.sh
> @@ -0,0 +1,2 @@
> +#!/bin/bash
> +exec ./autogen.sh
> diff --git a/rules/classpath.in b/rules/classpath.in
> index 16017b2..271a917 100644
> --- a/rules/classpath.in
> +++ b/rules/classpath.in
> @@ -5,6 +5,7 @@ config CLASSPATH
>  	prompt "classpath"
>  	select GCCLIBS_GCC_S
>  	select HOST_SYSTEM_JDK
> +	select HOST_GETTEXT
>  	help
>  	  GNU Classpath, Essential Libraries for Java, is a GNU project to create
>  	  free core class libraries for use with virtual machines and compilers
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Guillermo Rodriguez Garcia]

[-- Attachment #1.1: Type: text/plain, Size: 2700 bytes --]

El viernes, 16 de noviembre de 2018, Michael Olbrich <
m.olbrich@pengutronix.de> escribió:

> On Fri, Nov 16, 2018 at 12:20:18PM +0100, Guillermo Rodríguez wrote:
> > Commit bbc978e623cafc added a patch intended to fix building
> > with OpenJDK 1.8, however that commit was not complete. It is
> > necessary to run autogen.sh so that the configure script is
> > regenerated and the patched m4 macros are used.
> >
> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
>
> Unfortunately it's not that simple. The */Makefile.am also need the
> 1.5 -> 1.6 change. I tried that an then I get lots of errors like this:
>
> warning: as of release 9, '_' is a keyword, and may not be used as an
> identifier


Uhm, those are not errors, they are warnings (as long as we specify -target
< 9, which is the case here). Anyway from these messages it looks like you
are building with OpenJDK9? That is not supposed to work; the intent of the
patch was to allow building with OpenJDK8... can you check the version of
javac?

Guillermo



>
> Michael
>
> > ---
> >  patches/classpath-0.99/autogen.sh | 2 ++
> >  rules/classpath.in                | 1 +
> >  2 files changed, 3 insertions(+)
> >  create mode 100755 patches/classpath-0.99/autogen.sh
> >
> > diff --git a/patches/classpath-0.99/autogen.sh b/patches/classpath-0.99/
> autogen.sh
> > new file mode 100755
> > index 0000000..9ca025f
> > --- /dev/null
> > +++ b/patches/classpath-0.99/autogen.sh
> > @@ -0,0 +1,2 @@
> > +#!/bin/bash
> > +exec ./autogen.sh
> > diff --git a/rules/classpath.in b/rules/classpath.in
> > index 16017b2..271a917 100644
> > --- a/rules/classpath.in
> > +++ b/rules/classpath.in
> > @@ -5,6 +5,7 @@ config CLASSPATH
> >       prompt "classpath"
> >       select GCCLIBS_GCC_S
> >       select HOST_SYSTEM_JDK
> > +     select HOST_GETTEXT
> >       help
> >         GNU Classpath, Essential Libraries for Java, is a GNU project to
> create
> >         free core class libraries for use with virtual machines and
> compilers
> > --
> > 1.9.1
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de



-- 
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com

[-- Attachment #1.2: Type: text/html, Size: 3935 bytes --]

[-- Attachment #2: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Michael Olbrich]

On Sat, Nov 17, 2018 at 01:33:19AM +0100, Guillermo Rodriguez Garcia wrote:
> El viernes, 16 de noviembre de 2018, Michael Olbrich <
> m.olbrich@pengutronix.de> escribió:
> 
> > On Fri, Nov 16, 2018 at 12:20:18PM +0100, Guillermo Rodríguez wrote:
> > > Commit bbc978e623cafc added a patch intended to fix building
> > > with OpenJDK 1.8, however that commit was not complete. It is
> > > necessary to run autogen.sh so that the configure script is
> > > regenerated and the patched m4 macros are used.
> > >
> > > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> >
> > Unfortunately it's not that simple. The */Makefile.am also need the
> > 1.5 -> 1.6 change. I tried that an then I get lots of errors like this:
> >
> > warning: as of release 9, '_' is a keyword, and may not be used as an
> > identifier
> 
> 
> Uhm, those are not errors, they are warnings (as long as we specify -target
> < 9, which is the case here). Anyway from these messages it looks like you
> are building with OpenJDK9? That is not supposed to work; the intent of the
> patch was to allow building with OpenJDK8... can you check the version of
> javac?

Right, I missed the errors because of all those warnings:
[...]/classpath-0.99/java/util/regex/Matcher.java:623: error: unmappable character (0xC2) for encoding US-ASCII
   *??@since 1.5
    ^

There is some white-space there that does not match the selected encoding,
I think. If I replace this with a space, then building the package
succeeds.
So please add the Makefile.am changes to the first patch and create another
to fix this whitespace.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Guillermo Rodriguez Garcia]

El sáb., 17 nov. 2018 a las 14:50, Michael Olbrich
(<m.olbrich@pengutronix.de>) escribió:
>
> On Sat, Nov 17, 2018 at 01:33:19AM +0100, Guillermo Rodriguez Garcia wrote:
> > El viernes, 16 de noviembre de 2018, Michael Olbrich <
> > m.olbrich@pengutronix.de> escribió:
> >
> > > On Fri, Nov 16, 2018 at 12:20:18PM +0100, Guillermo Rodríguez wrote:
> > > > Commit bbc978e623cafc added a patch intended to fix building
> > > > with OpenJDK 1.8, however that commit was not complete. It is
> > > > necessary to run autogen.sh so that the configure script is
> > > > regenerated and the patched m4 macros are used.
> > > >
> > > > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > >
> > > Unfortunately it's not that simple. The */Makefile.am also need the
> > > 1.5 -> 1.6 change. I tried that an then I get lots of errors like this:
> > >
> > > warning: as of release 9, '_' is a keyword, and may not be used as an
> > > identifier
> >
> >
> > Uhm, those are not errors, they are warnings (as long as we specify -target
> > < 9, which is the case here). Anyway from these messages it looks like you
> > are building with OpenJDK9? That is not supposed to work; the intent of the
> > patch was to allow building with OpenJDK8... can you check the version of
> > javac?
>
> Right, I missed the errors because of all those warnings:
> [...]/classpath-0.99/java/util/regex/Matcher.java:623: error: unmappable character (0xC2) for encoding US-ASCII
>    *??@since 1.5
>     ^
>
> There is some white-space there that does not match the selected encoding,
> I think. If I replace this with a space, then building the package
> succeeds.
> So please add the Makefile.am changes to the first patch and create another
> to fix this whitespace.

Please let me have a look at this.

However, can you confirm which javac are you using? I believe javac
from OpenJDK 1.8 should not require any of this.

Best,

Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/2] classpath: Fix for building with OpenJDK-1.8 (again)

[Guillermo Rodríguez]

Commit bbc978e623cafc added a patch intended to fix building
with OpenJDK 1.8, however that commit was not complete. Update
-source/-target in Makefiles and run autogen.sh so that the
configure script is regenerated and the patched m4 macros are
used.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 .../0001-Fix-building-with-OpenJDK-1.8.patch       | 57 ++++++++++++++++++++--
 patches/classpath-0.99/autogen.sh                  |  2 +
 rules/classpath.in                                 |  1 +
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100755 patches/classpath-0.99/autogen.sh

diff --git a/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch b/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch
index fe7d3ba..5ed03e8 100644
--- a/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch
+++ b/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch
@@ -7,14 +7,49 @@ javac from OpenJDK 1.7+ will try (and fail) to recompile "standard"
 Java classes (e.g. java/lang/Object.java) when compiling the Java
 test class. Fix this by explicitly passing an empty -sourcepath.
 
-- Test for 1.6 instead of 1.5, as -source/-target 1.5 is deprecated
-in Java 8, and the Makefiles already use -source/-target 1.6 anyway.
+- Use -source/-target 1.6 instead of 1.5, as the latter is
+deprecated in Java 8.
 
 ---
+ examples/Makefile.am      | 4 ++--
+ lib/Makefile.am           | 4 ++--
  m4/ac_prog_java_works.m4  | 3 ++-
  m4/ac_prog_javac_works.m4 | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ tools/Makefile.am         | 4 ++--
+ 5 files changed, 10 insertions(+), 9 deletions(-)
 
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index ff47801..ba40c08 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -2,9 +2,9 @@
+ GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib'
+ 
+ if GCJ_JAVAC
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.6 -ftarget=1.6 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
+ else
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.6 -target 1.6 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
+ endif
+ 
+ # All our example java source files
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 50d1baa..97a8b69 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -9,9 +9,9 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$
+ 
+ # handling source to bytecode compiler programs like gcj, jikes  and kjc
+ if GCJ_JAVAC
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --bootclasspath='' --classpath=$(compile_classpath) -d . @classes
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.6 -ftarget=1.6 --bootclasspath='' --classpath=$(compile_classpath) -d . @classes
+ else
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.6 -target 1.6 -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+ endif
+ 
+ if CREATE_COLLECTIONS
 diff --git a/m4/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4
 index d3f2744..f36318b 100644
 --- a/m4/ac_prog_java_works.m4
@@ -45,6 +80,22 @@ index 7fb298d..fbe24ce 100644
  fi
  if AC_TRY_COMMAND($CMD) >/dev/null 2>&1; then
    ac_cv_prog_javac_works=yes
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index c5db7cd..54cd2ce 100755
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -14,9 +14,9 @@ GLIBJ_CLASSPATH=asm:$(ANTLR_CLASSPATH)
+ 
+ # Setup the compiler to use the GNU Classpath library we just built.
+ if GCJ_JAVAC
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH)
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.6 -ftarget=1.6 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH)
+ else
+-JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
++JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.6 -target 1.6 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
+ endif
+ 
+ if CREATE_WRAPPERS
 -- 
 1.9.1
 
diff --git a/patches/classpath-0.99/autogen.sh b/patches/classpath-0.99/autogen.sh
new file mode 100755
index 0000000..9ca025f
--- /dev/null
+++ b/patches/classpath-0.99/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ./autogen.sh
diff --git a/rules/classpath.in b/rules/classpath.in
index 16017b2..271a917 100644
--- a/rules/classpath.in
+++ b/rules/classpath.in
@@ -5,6 +5,7 @@ config CLASSPATH
 	prompt "classpath"
 	select GCCLIBS_GCC_S
 	select HOST_SYSTEM_JDK
+	select HOST_GETTEXT
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU project to create
 	  free core class libraries for use with virtual machines and compilers
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/2] classpath: Fix building when default locale is not UTF-8

[Guillermo Rodríguez]

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 .../0002-Fix-unmappable-character-error.patch      | 23 ++++++++++++++++++++++
 patches/classpath-0.99/series                      |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 patches/classpath-0.99/0002-Fix-unmappable-character-error.patch

diff --git a/patches/classpath-0.99/0002-Fix-unmappable-character-error.patch b/patches/classpath-0.99/0002-Fix-unmappable-character-error.patch
new file mode 100644
index 0000000..0aa7beb
--- /dev/null
+++ b/patches/classpath-0.99/0002-Fix-unmappable-character-error.patch
@@ -0,0 +1,23 @@
+Fix unmappable character to make it possible to build when
+default locale is not UTF-8.
+
+---
+ java/util/regex/Matcher.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/java/util/regex/Matcher.java b/java/util/regex/Matcher.java
+index 8d033d5..584d9a4 100644
+--- a/java/util/regex/Matcher.java
++++ b/java/util/regex/Matcher.java
+@@ -620,7 +620,7 @@ public final class Matcher implements MatchResult
+    *
+    * @param s the string to literalize.
+    * @return the literalized string.
+-   * @since 1.5
++   * @since 1.5
+    */
+   public static String quoteReplacement(String s)
+   {
+-- 
+1.9.1
+
diff --git a/patches/classpath-0.99/series b/patches/classpath-0.99/series
index 1fffdbd..a1234fb 100644
--- a/patches/classpath-0.99/series
+++ b/patches/classpath-0.99/series
@@ -1 +1,2 @@
 0001-Fix-building-with-OpenJDK-1.8.patch
+0002-Fix-unmappable-character-error.patch
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix for building with OpenJDK-1.8 (again)

[Michael Olbrich]

On Mon, Nov 19, 2018 at 10:30:06AM +0100, Guillermo Rodriguez Garcia wrote:
> El sáb., 17 nov. 2018 a las 14:50, Michael Olbrich
> (<m.olbrich@pengutronix.de>) escribió:
> >
> > On Sat, Nov 17, 2018 at 01:33:19AM +0100, Guillermo Rodriguez Garcia wrote:
> > > El viernes, 16 de noviembre de 2018, Michael Olbrich <
> > > m.olbrich@pengutronix.de> escribió:
> > >
> > > > On Fri, Nov 16, 2018 at 12:20:18PM +0100, Guillermo Rodríguez wrote:
> > > > > Commit bbc978e623cafc added a patch intended to fix building
> > > > > with OpenJDK 1.8, however that commit was not complete. It is
> > > > > necessary to run autogen.sh so that the configure script is
> > > > > regenerated and the patched m4 macros are used.
> > > > >
> > > > > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > > >
> > > > Unfortunately it's not that simple. The */Makefile.am also need the
> > > > 1.5 -> 1.6 change. I tried that an then I get lots of errors like this:
> > > >
> > > > warning: as of release 9, '_' is a keyword, and may not be used as an
> > > > identifier
> > >
> > >
> > > Uhm, those are not errors, they are warnings (as long as we specify -target
> > > < 9, which is the case here). Anyway from these messages it looks like you
> > > are building with OpenJDK9? That is not supposed to work; the intent of the
> > > patch was to allow building with OpenJDK8... can you check the version of
> > > javac?
> >
> > Right, I missed the errors because of all those warnings:
> > [...]/classpath-0.99/java/util/regex/Matcher.java:623: error: unmappable character (0xC2) for encoding US-ASCII
> >    *??@since 1.5
> >     ^
> >
> > There is some white-space there that does not match the selected encoding,
> > I think. If I replace this with a space, then building the package
> > succeeds.
> > So please add the Makefile.am changes to the first patch and create another
> > to fix this whitespace.
> 
> Please let me have a look at this.
> 
> However, can you confirm which javac are you using? I believe javac
> from OpenJDK 1.8 should not require any of this.

It the current default jdk from Debian unstable. That's OpenJDK 11.

Anyways, the new patches work as expected and are now in master. Thanks!

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de