On Tue, Oct 22, 2013 at 10:33 PM, Magnus Ihse Bursie <magnus.ihse.bur...@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'm currently running a test build because I'm not sure that we can omit the "X11/extensions" directory from the include path. As far as I know, X_CFLAGS only contains /usr/include/X11/. I'll let you know once the build is finished. And I can not refrain from stating that you could have saved a lot of time and work if you'd integrated my changes for 8017568 right into jdk8/build back then in July. (Because I know what licensees like:) > /Magnus
