[OpenJDK 2D-Dev] RFR: Allow using a system-installed lcms2

Magnus Ihse Bursie magnus.ihse.bursie at oracle.com
Mon Mar 17 11:27:48 UTC 2014


On 2014-03-01 00:24, Omair Majid wrote:
> * Phil Race <philip.race at oracle.com> [2014-02-28 16:46]:
>> The moving of most of these files will cause me some significant pain.
> Oh. Sorry :(
>
> Is there anything I (or possibly the jigsaw folks) can do to minimize
> it?
>
>> I am not convinced why its necessary.
> Basically, there is one file there (LCMS.c) that I want to make sure
> that does not get compiled against the headers located in the same
> directory. One way to be absolutely certain is to move the files out of
> that directory into another. `#include <..>` rather than `#include
> "..."` might also be sufficient but seems less of a guarantee
> (especially because then I have to filter things so the compiler
> invocation only includes LCMS.c and not the bundled lcms code). It seems
> the patch would be more complex (from a Makefile point) to test.
>
> I also figured it's a nice cleanup, separating code that is maintained
> in OpenJDK from code that isn't.

I had an offline discussion with Erik regarding this.

While we generally support moving files to a proper location, if this 
move is causing trouble for Phil and the 2d team, we think it can be an 
acceptable exception this time to just single out the LCMS.c file. (This 
can be achieved by setting INCLUDE_FILES:=LCMS.c -- that will 
automatically exclude other files in the SRC dirs.) If we do reorganize 
the source code, we can handle where to move the files at that time instead.

>> I need to look at this more, but I have no time right now.
> Fair enough. I don't mind waiting for a few weeks. Any idea when you
> might have some time?

Phil, ping?

>
>> And this needs to be built and tested on all platforms to be approved.
>> And open & closed builds need to work. I'm not sure they will.
>> That suggests I'd need to run it through JPRT.
> If there is a way for non-Oracle folks to access JPRT, I will be happy
> to run this patch through it myself.

Unfortunately there is not. However, I can help you run the neccessary 
JPRT tests if we can get to a patch that 2d is comfortable with.

/Magnus



More information about the build-dev mailing list