[OpenJDK 2D-Dev] RFR: JDK-8042208: Build fails on Solaris using devkit when X isn't installed (original) (raw)
Erik Joelsson erik.joelsson at oracle.com
Wed Apr 30 11:33:40 UTC 2014
- Previous message: [OpenJDK 2D-Dev] [9] Review Request: 8042199 The build of J2DBench via makefile is broken after the JDK-8005402
- Next message: [OpenJDK 2D-Dev] RFR: JDK-8042208: Build fails on Solaris using devkit when X isn't installed
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hello,
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:
diff -r 830cc367f41b make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -798,6 +798,10 @@ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing endif
+# Libfontmanager doesn't actually need X_LIBS to link, but if building
+# on a Solaris machine without X installed, using a devkit, linking
+# to libawt_xawt will fail without the -L parameters from X_LIBS. Filter
+# out the -R parameters since they aren't needed.
(eval(eval (eval(call SetupNativeCompilation,BUILD_LIBFONTMANAGER,
LIBRARY := fontmanager,
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE),
@@ -816,7 +820,8 @@
$(call SET_SHARED_LIBRARY_ORIGIN),
LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB),
LDFLAGS_SUFFIX_linux := -lawt (LIBM)(LIBM) (LIBM)(LIBCXX) -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc (LIBM)(LIBM) (LIBM)(LIBCXX)
-ljava -ljvm, \
- LDFLAGS_SUFFIX_solaris := (filter−out−R(filter-out -R%, (filter−out−R(X_LIBS)) \
-lawt -lawt_xawt -lc <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>L</mi><mi>I</mi><mi>B</mi><mi>M</mi><mo stretchy="false">)</mo></mrow><annotation encoding="application/x-tex">(LIBM) </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mopen">(</span><span class="mord mathnormal">L</span><span class="mord mathnormal" style="margin-right:0.07847em;">I</span><span class="mord mathnormal" style="margin-right:0.10903em;">BM</span><span class="mclose">)</span></span></span></span>(LIBCXX) -ljava -ljvm, \ LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>L</mi><mi>I</mi><mi>B</mi><mi>M</mi><mo stretchy="false">)</mo></mrow><annotation encoding="application/x-tex">(LIBM) </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mopen">(</span><span class="mord mathnormal">L</span><span class="mord mathnormal" style="margin-right:0.07847em;">I</span><span class="mord mathnormal" style="margin-right:0.10903em;">BM</span><span class="mclose">)</span></span></span></span>(LIBCXX) -ljava
-ljvm,
LDFLAGS_SUFFIX_macosx := -lawt (LIBM)(LIBM) (LIBM)(LIBCXX) -undefined
dynamic_lookup
-ljava -ljvm, \
/Erik
- Previous message: [OpenJDK 2D-Dev] [9] Review Request: 8042199 The build of J2DBench via makefile is broken after the JDK-8005402
- Next message: [OpenJDK 2D-Dev] RFR: JDK-8042208: Build fails on Solaris using devkit when X isn't installed
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]