diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-03-30 01:06:20 +0800 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-03-30 01:06:20 +0800 |
| commit | 51cf7dc1350c35e376a024fb921c2c49ae9bc5ab (patch) | |
| tree | 4891958af6f9af12e8db5da58db19180894864d2 /java | |
| parent | a0fb87e4ecfded088eaddef8e558e61d0c074507 (diff) | |
| download | freebsd-ports-gnome-51cf7dc1350c35e376a024fb921c2c49ae9bc5ab.tar.gz freebsd-ports-gnome-51cf7dc1350c35e376a024fb921c2c49ae9bc5ab.tar.zst freebsd-ports-gnome-51cf7dc1350c35e376a024fb921c2c49ae9bc5ab.zip | |
Fix DTrace support for 32 bit platforms and re-enable it.
PR: 236876
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk11/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index a7fd3dd0536c..aab32398480a 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -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 diff --git a/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk b/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk new file mode 100644 index 000000000000..a3bc5762dedb --- /dev/null +++ b/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk @@ -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. |