[OpenJDK 2D-Dev] RFR: JDK-8042208: Build fails on Solaris using devkit when X isn't installed (original) (raw)

Tim Bell tim.bell at oracle.com
Wed Apr 30 12:39:35 UTC 2014

Hi Erik:

Please review this small fix to the build when linking libfontmanager.so on Solaris. Further explanation in the bug.

Bug: https://bugs.openjdk.java.net/browse/JDK-8042208 Patch inline:

Looks good to me.

Tim

diff -r 830cc367f41b make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -798,6 +798,10 @@ BUILDLIBFONTMANAGERExtensionSubtables.cppCXXFLAGS := -fno-strict-aliasing endif

+# Libfontmanager doesn't actually need XLIBS to link, but if building +# on a Solaris machine without X installed, using a devkit, linking +# to libawtxawt will fail without the -L parameters from XLIBS. Filter +# out the -R parameters since they aren't needed. _$(eval $(call SetupNativeCompilation,BUILDLIBFONTMANAGER, _ _LIBRARY := fontmanager, _ _OUTPUTDIR := $(INSTALLLIBRARIESHERE), _ @@ -816,7 +820,8 @@ _$(call SETSHAREDLIBRARYORIGIN), _ _LDFLAGSSUFFIX := $(BUILDLIBFONTMANAGERFONTLIB), _ _LDFLAGSSUFFIXlinux := -lawt (LIBM)(LIBM) (LIBM)(LIBCXX) -ljava -ljvm -lc, _ - LDFLAGSSUFFIXsolaris := -lawt -lawtxawt -lc (LIBM)(LIBM) (LIBM)(LIBCXX) _-ljava -ljvm, _ _+ LDFLAGSSUFFIXsolaris := (filter−out−R(filter-out -R%, (filter−out−R(XLIBS)) _ _+ -lawt -lawtxawt -lc (LIBM)(LIBM) (LIBM)(LIBCXX) -ljava -ljvm, _ LDFLAGSSUFFIXaix := -lawt -lawtxawt (LIBM)(LIBM) (LIBM)(LIBCXX) -ljava _-ljvm,_ LDFLAGSSUFFIXmacosx := -lawt (LIBM)(LIBM) (LIBM)(LIBCXX) -undefined _dynamiclookup _ _-ljava -ljvm, _ /Erik

More information about the 2d-dev mailing list