Date: Fri, 29 Mar 2019 17:06:21 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497169 - in head/java/openjdk11: . files Message-ID: <201903291706.x2TH6LaS035101@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Mar 29 17:06:20 2019 New Revision: 497169 URL: https://svnweb.freebsd.org/changeset/ports/497169 Log: Fix DTrace support for 32 bit platforms and re-enable it. PR: 236876 Added: head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk (contents, props changed) Modified: head/java/openjdk11/Makefile Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk11/Makefile Fri Mar 29 16:36:45 2019 (r497168) +++ head/java/openjdk11/Makefile Fri Mar 29 17:06:20 2019 (r497169) @@ -89,10 +89,6 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> -.if ${ARCH} == i386 -CONFIGURE_ARGS+= --disable-dtrace -.endif - BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 Added: head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk Fri Mar 29 17:06:20 2019 (r497169) @@ -0,0 +1,18 @@ +--- make/hotspot/lib/JvmDtraceObjects.gmk ++++ make/hotspot/lib/JvmDtraceObjects.gmk +@@ -201,8 +201,13 @@ ifeq ($(call check-jvm-feature, dtrace), true) + ) + endif + +- DTRACE_FLAGS := -64 -G +- DTRACE_CPP_FLAGS := -D_LP64 -x c ++ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ++ DTRACE_FLAGS := -32 -G ++ DTRACE_CPP_FLAGS := -x c ++ else ++ DTRACE_FLAGS := -64 -G ++ DTRACE_CPP_FLAGS := -D_LP64 -x c ++ endif + + # Make sure we run our selected compiler for preprocessing instead of letting + # the dtrace tool pick it on it's own.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903291706.x2TH6LaS035101>