diff options
| author | tnn <tnn@pkgsrc.org> | 2016-03-12 07:31:02 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2016-03-12 07:31:02 +0000 |
| commit | ea40698ba72702a4a04c14747a2a678fda2a9e1c (patch) | |
| tree | 1ec71b81c26a67e352d4a13b1fceed9ff4b6fcfa /lang | |
| parent | 0a8b06f1154550f63050a2762885be6d2829976f (diff) | |
| download | pkgsrc-ea40698ba72702a4a04c14747a2a678fda2a9e1c.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')
| -rw-r--r-- | lang/openjdk8/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 8ad2fb84658..723946b4d7d 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2016/02/19 22:59:27 ryoon Exp $ +$NetBSD: distinfo,v 1.34 2016/03/12 07:31:02 tnn Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -104,7 +104,7 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 48427d0ff3f29781d2beabf564e8bf55fa5 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 -SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 5fed2c4036080dd5230941bbb76025859e936267 +SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317 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 |