RFR: JDK-8026888: Licensee build failure due to wrong libs being called

[Volker Simonis]

On Tue, Oct 22, 2013 at 10:33 PM, Magnus Ihse Bursie
<magnus.ihse.bursie at oracle.com> wrote:
> On 2013-10-22 19:54, Volker Simonis wrote:
>
>
> Well, I don't think so. As far as I can see it is used for everything which
> is not Windows and not Solaris in Awt2dLibraries.gmk:
>
> +  else ifeq ($(OPENJDK_TARGET_OS), solaris)
>      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include
> -I$(OPENWIN_HOME)/include/X11/extensions
>
>  else
>
> -    LIBSPLASHSCREEN_CFLAGS
>
> += -DWITH_WIN32
> +    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
> -I$(OPENWIN_HOME)/include/X11/extensions
>
>  endif
>
>
> Or am I missing something?
>
>
> No, you are not missing anything. :-) You are absolutely correct; however,
> the -I$(OPENWIN_HOME)/include/X11/extensions was not supposed to be there
> except for Solaris. Erik must have missed to remove it when copying the
> CFLAGS line, just as I missed it when reviewing.
>
> Good catch!
>
> With the non-Solaris-and-non-Window line reading
> LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
> instead, I hope you can agree with my statement. :)
>

I've just verified that it works! The the "X11/extensions" directory
isn't actually needed in the include path on Linux.

I'm even wondering if this is needed for Solaris because as far as I
can see, the files included from there are always included with the
full path (i.e. <X11/extensions/XInput.h>).

Regards,
Volker


> /Magnus