diff options
| author | tnn <tnn> | 2016-03-12 07:31:02 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2016-03-12 07:31:02 +0000 |
| commit | a604ac7cb22ce324bce377563510613db0ee8c97 (patch) | |
| tree | 1ec71b81c26a67e352d4a13b1fceed9ff4b6fcfa /lang/openjdk8/patches | |
| parent | 5c3d3ce4a8f8f22ada9ba63485d8a5fa4fb9e0a0 (diff) | |
| download | pkgsrc-a604ac7cb22ce324bce377563510613db0ee8c97.tar.gz | |
Make sure to use $(X_LIBS) when linking libjawt.so against libawt_xawt.so.
Might fix "ld: fatal: library -lXrender: not found" seen in SmartOS bulk build.
Diffstat (limited to 'lang/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk index a200a3e131d..1c7408b4332 100644 --- a/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk +++ b/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.1 2015/07/03 20:40:59 fhajny Exp $ +$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.2 2016/03/12 07:31:02 tnn Exp $ GCC support. ---- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-06-10 10:36:24.000000000 +0000 +--- jdk/make/lib/Awt2dLibraries.gmk.orig 2016-02-19 14:48:27.000000000 +0000 +++ jdk/make/lib/Awt2dLibraries.gmk @@ -695,7 +695,6 @@ $(eval $(call SetupNativeCompilation,BUI $(SHARED_LIBRARY_FLAGS) \ @@ -12,3 +12,12 @@ GCC support. CFLAGS_windows := -DCMS_IS_WINDOWS_, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ +@@ -1070,7 +1069,7 @@ else # OPENJDK_TARGET_OS not windows + JAWT_LIBS += -lawt + endif + ifndef BUILD_HEADLESS_ONLY +- JAWT_LIBS += -lawt_xawt ++ JAWT_LIBS += $(X_LIBS) -lawt_xawt + else + JAWT_LIBS += -lawt_headless + HEADLESS_CFLAG += -DHEADLESS |