[yocto] [meta-java][PATCH 1/2] openjdk-8: fix MAKE detection patch

André Draszik git at andred.net
Thu Mar 15 02:10:05 PDT 2018


On Tue, 2018-03-13 at 18:10 +0200, Maxin B. John wrote:
> Hi André,
> 
> On Mon, Mar 12, 2018 at 04:38:05PM +0000, André Draszik wrote:
> > From: André Draszik <andre.draszik at jci.com>
> > 
> > The patch had a few typos, leading to errors during ./configure
> >    ../jdk8u-4be07cb28b21/common/autoconf/configure: line 8408: test: too
> > many arguments
> > 
> > Change-Id: I867eba7aae3390aa869e69c86f29e77b505043e7
> > ---
> >  recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch
> > | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-
> > for-make.patch b/recipes-core/openjdk/patches-openjdk-8/dont-expect-
> > fqpn-for-make.patch
> > index 6454237..5192d1a 100644
> > --- a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-
> > make.patch
> > +++ b/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-
> > make.patch
> > @@ -6,7 +6,7 @@
> >       # User has supplied a make, test it.
> >  -    if test ! -f "$MAKE"; then
> >  -      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
> > -+    if test -a `dirname "$MAKE"` = "." -a ! -f "$MAKE"; then
> > ++    if test `dirname "$MAKE"` = "." && ! test -f "$MAKE"; then
> >  +      AC_PATH_PROGS(CHECK_MAKE, $MAKE)
> >  +    else
> >  +      CHECK_MAKE="${MAKE}"
> > --
> 
> Merged, Thanks.

Thanks Maxin.

Did you forget the 2nd patch, or is there an issue with it?

BTW, I just noticed that master and master-next have diverged quite a lot -
what is the plan wrt that?

Cheers,
Andre'




More information about the yocto mailing list