[8u66] 8130938: Incomplete 8ux fix for 8071710: libfontmanager & t2k should link against headless awt on solaris
Sergey.Bylokhov at oracle.com
Wed Jul 22 17:28:16 UTC 2015
On 22.07.15 19:46, Phil Race wrote:
> Could I please also have a code review from some one ?
> There's not much time before PIT freeze ..
> On 07/21/2015 02:04 PM, Seán Coffey wrote:
>> Looks fine to me Phil. Thanks for handling.
>> Approved. RDP2 for 8u66  is approaching fast. We'll have to work
>> out if this makes the PIT snapshot.
>>  http://openjdk.java.net/projects/jdk8u/releases/8u66.html
>> On 21/07/2015 20:11, Phil Race wrote:
>>> Bug : https://bugs.openjdk.java.net/browse/JDK-8130938
>>> 8071710 fixed the issue of libfontmanager and libt2k linking against
>>> X11 on JDK 9 for Solaris.
>>> This was subsequently backported to JDK8u but one line was missed so
>>> incorrectly libt2k
>>> still depends on X11 libraries on 8u.
>>> This is a request for review and approval to push to 8u66.
>>> The one line change is in-line below. jprt verified the build.
>>> hg diff make/lib/Awt2dLibraries.gmk
>>> diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
>>> --- a/make/lib/Awt2dLibraries.gmk
>>> +++ b/make/lib/Awt2dLibraries.gmk
>>> @@ -983,7 +983,7 @@
>>> $(call SET_SHARED_LIBRARY_ORIGIN), \
>>> LDFLAGS_windows := user32.lib
>>> $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
>>> LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager
>>> -ljava -ljvm -lc, \
>>> - LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
>>> + LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless, \
>>> VERSIONINFO_RESOURCE :=
>>> $(JDK_TOPDIR)/src/windows/resource/version.rc, \
>>> RC_FLAGS := $(RC_FLAGS) \
>>> -D "JDK_FNAME=t2k.dll" \
Best regards, Sergey.
More information about the build-dev