From 2434d5beadc6fb6eee95290d5b6e17fa101a0e85 Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Thu, 30 Jan 2025 17:05:55 -0500 Subject: [PATCH] Remove --without-cmake support Signed-off-by: Peter Shipton --- closed/OpenJ9.gmk | 396 ++++++++--------------------- closed/autoconf/custom-hook.m4 | 93 +------ closed/autoconf/custom-spec.gmk.in | 11 +- 3 files changed, 105 insertions(+), 395 deletions(-) diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index d62a8527ec5..dfd98e39ab2 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -78,21 +78,10 @@ else OPENJ9_VERSION_STRING := $(OPENJ9_BRANCH)-$(OPENJ9_SHA) endif -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - # If a logging level was specified that shows commands, tell cmake to do likewise. - ifneq (,$(or $(filter true,$(LOG_CMDLINES)),$(filter debug trace,$(LOG_LEVEL)))) - MAKE_ARGS += VERBOSE=ON - endif -else - # MAKEFLAGS, as inherited from openjdk, includes options (e.g. '-r' and '-R') - # that don't work well with OpenJ9 and OMR when not using cmake. - unexport MAKEFLAGS - # Filter out unwanted make flags. - MAKE_ARGS := $(filter-out -R -r -s,$(MAKE_ARGS)) - ifneq (,$(JOBS)) - MAKE_ARGS += -j $(JOBS) - endif -endif # OPENJ9_ENABLE_CMAKE +# If a logging level was specified that shows commands, tell cmake to do likewise. +ifneq (,$(or $(filter true,$(LOG_CMDLINES)),$(filter debug trace,$(LOG_LEVEL)))) + MAKE_ARGS += VERBOSE=ON +endif # Propagate configure option '--disable-warnings-as-errors-omr' to OMR. ifeq (false,$(WARNINGS_AS_ERRORS_OMR)) @@ -124,31 +113,8 @@ endif clean-openj9-thirdparty-binaries \ openj9-config-headers \ run-preprocessors-j9 \ - stage-j9 \ # -# openj9_copy_tree -# ---------------- -# $1 = The target directory to create or update. -# $2 = The source directory to copy. -openj9_copy_tree = $(call openj9_copy_tree_impl,$(strip $1),$(strip $2)) - -OPENJ9_MARKER_FILE := .up-to-date - -# Use '-m' to update file modification times ('-m' is equivalent to '--touch' in some implementations of tar). -define openj9_copy_tree_impl - @$(MKDIR) -p $1 - @$(TAR) --create --directory=$2 $(if $(wildcard $1/$(OPENJ9_MARKER_FILE)),--newer=$1/$(OPENJ9_MARKER_FILE)) --exclude=.git . \ - | $(TAR) --extract --directory=$1 -m - @$(TOUCH) $1/$(OPENJ9_MARKER_FILE) -endef - -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - CONFIG_HEADERS := j9cfg.h omr/omrcfg.h -else - CONFIG_HEADERS := include/j9cfg.h omr/include_core/omrcfg.h -endif - define openj9_config_header_rules openj9-config-headers : $(SUPPORT_OUTPUTDIR)/openj9_include/$(notdir $1) @@ -157,7 +123,7 @@ define openj9_config_header_rules endef $(foreach file, \ - $(CONFIG_HEADERS), \ + j9cfg.h omr/omrcfg.h, \ $(eval $(call openj9_config_header_rules, $(OPENJ9_VM_BUILD_DIR)/$(file)))) # openj9_test_image_rules @@ -229,123 +195,6 @@ $(foreach file, \ $(if $(wildcard $(file)), \ $(eval $(call openj9_test_image_rules, $(file))))) -# Comments for stage-j9 -# Currently there is a staged location where j9 is built. This is due to a number of reasons: -# 1. make currently leaves output files in current directory -# 2. generated source and header files -# 3. repo layout compared to source.zip layout -# See issue 49 for more information and actions to correct this action. - -# Functions to generate sed program fragments. -# $1 - name of flag to be enabled or disabled. -SedDisable = -e '/"$(strip $1)"/s/"true"/"false"/g' -SedEnable = -e '/"$(strip $1)"/s/"false"/"true"/g' - -# Adjust features based on our configuration. -ifeq (true,$(OPENJ9_ENABLE_CUDA)) - FEATURE_SED_SCRIPT := $(call SedEnable,opt_cuda) -else - FEATURE_SED_SCRIPT := $(call SedDisable,opt_cuda) -endif - -# Function to generate sed program fragment. -# $1 - name of make macro to use instead of a hard-coded tool reference. -# $2 - suffix of uma_make_cmd property name to be adjusted. -SedUmaCommand = -e '/ $$@ - else ifeq (.spec,$(suffix $1)) - @$(SED) $(SPEC_SED_SCRIPT) < $$< > $$@ - else - @$(CP) $$< $$@ - endif -endef - -$(foreach file, \ - $(notdir $(wildcard $(OPENJ9_TOPDIR)/buildspecs/*)), \ - $(eval $(call openj9_stage_buildspec_file,$(file)))) - -stage-j9 : - @$(ECHO) Staging OpenJ9 runtime in $(OUTPUTDIR)/vm - $(call openj9_copy_tree,$(OUTPUTDIR)/vm,$(OPENJ9_TOPDIR)/runtime) - - @$(ECHO) Staging OpenJ9 OMR in $(OUTPUTDIR)/vm - $(call openj9_copy_tree,$(OUTPUTDIR)/vm/omr,$(OPENJ9OMR_TOPDIR)) - OPENJ9_VERSION_VARS := \ COMPANY_NAME \ COMPILER_VERSION_STRING \ @@ -395,9 +244,7 @@ run-preprocessors-j9 : \ $(OPENJ9_VM_BUILD_DIR)/compiler/jit.version \ $(OPENJ9_VM_BUILD_DIR)/include/openj9_version_info.h -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - - CMAKE_ARGS := \ +CMAKE_ARGS := \ -C $(OPENJ9_TOPDIR)/runtime/cmake/caches/$(patsubst %_cross,%,$(OPENJ9_BUILDSPEC)).cmake \ -DBOOT_JDK="$(BOOT_JDK)" \ -DBUILD_ID=$(BUILD_ID) \ @@ -411,102 +258,102 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE)) -DOPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \ # - # Windows can't specify compiler overrides since we already generated wrapper scripts. - ifneq (windows,$(OPENJDK_TARGET_OS)) - # Override the compilers if an OPENJ9_* value is specified. - # Otherwise, toolchain.cmake has the default values. - ifneq (,$(OPENJ9_CC)) - CMAKE_ARGS += -DCMAKE_C_COMPILER="$(OPENJ9_CC)" - endif - ifneq (,$(OPENJ9_CXX)) - CMAKE_ARGS += -DCMAKE_CXX_COMPILER="$(OPENJ9_CXX)" - endif - endif # windows - - ifneq (,$(CCACHE)) - # openjdk makefiles add a bunch of environemnt variables to the ccache command. - # CMake will not parse this properly, so we wrap the whole thing in the env command. - # We also need to add semicolons between arguments or else cmake will treat the whole - # thing as one long command name. - - # Note: We remove the CCACHE_COMPRESS option that openjdk adds, because it significantly - # slows down the build (to the point of erasing any gains from using ccache). - CCACHE_NOCOMPRESS := $(filter-out CCACHE_COMPRESS=1,$(CCACHE)) - ESCAPED_CCACHE := env$(subst $(SPACE),,$(addprefix ;,$(CCACHE_NOCOMPRESS))) - - CMAKE_ARGS += -DCMAKE_C_COMPILER_LAUNCHER="$(ESCAPED_CCACHE)" - CMAKE_ARGS += -DCMAKE_CXX_COMPILER_LAUNCHER="$(ESCAPED_CCACHE)" - endif # CCACHE - - ifeq (true,$(OPENJ9_ENABLE_JFR)) - CMAKE_ARGS += -DJ9VM_OPT_JFR=ON - else # OPENJ9_ENABLE_JFR - CMAKE_ARGS += -DJ9VM_OPT_JFR=OFF - endif # OPENJ9_ENABLE_JFR - - ifeq (true,$(OPENJ9_ENABLE_JITSERVER)) - CMAKE_ARGS += -DJ9VM_OPT_JITSERVER=ON - - ifneq (,$(OPENSSL_CFLAGS)) - CMAKE_ARGS += -DOPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" - endif - - ifneq (,$(OPENSSL_DIR)) - CMAKE_ARGS += -DOPENSSL_DIR="$(OPENSSL_DIR)" - endif - - ifneq (,$(OPENSSL_BUNDLE_LIB_PATH)) - CMAKE_ARGS += -DOPENSSL_BUNDLE_LIB_PATH="$(OPENSSL_BUNDLE_LIB_PATH)" - endif - else - CMAKE_ARGS += -DJ9VM_OPT_JITSERVER=OFF - endif # OPENJ9_ENABLE_JITSERVER - - ifeq (true,$(OPENJ9_ENABLE_SNAPSHOTS)) - CMAKE_ARGS += -DJ9VM_OPT_SNAPSHOTS=ON - else # OPENJ9_ENABLE_SNAPSHOTS - CMAKE_ARGS += -DJ9VM_OPT_SNAPSHOTS=OFF - endif # OPENJ9_ENABLE_SNAPSHOTS - - ifeq (true,$(OPENJ9_ENABLE_CUDA)) - CMAKE_ARGS += -DJ9VM_OPT_CUDA=ON -DOMR_CUDA_HOME="$(call UnixPath,$(CUDA_HOME))" - else # OPENJ9_ENABLE_CUDA - CMAKE_ARGS += -DJ9VM_OPT_CUDA=OFF - endif # OPENJ9_ENABLE_CUDA - - ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES)) - CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=ON - else # OPENJ9_ENABLE_INLINE_TYPES - CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=OFF - endif # OPENJ9_ENABLE_INLINE_TYPES - - ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT)) - CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=ON - else # OPENJ9_ENABLE_CRAC_SUPPORT - CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=OFF - endif # OPENJ9_ENABLE_CRAC_SUPPORT - - ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT)) - CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=ON - else # OPENJ9_ENABLE_CRIU_SUPPORT - CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=OFF - endif # OPENJ9_ENABLE_CRIU_SUPPORT - - CMAKE_ARGS += -DJ9VM_OPT_METHOD_HANDLE=OFF - CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_METHODHANDLE=ON - - # Propagate configure option '--disable-warnings-as-errors-omr' to OMR. - ifeq (false,$(WARNINGS_AS_ERRORS_OMR)) - CMAKE_ARGS += -DOMR_WARNINGS_AS_ERRORS=OFF +# Windows can't specify compiler overrides since we already generated wrapper scripts. +ifneq (windows,$(OPENJDK_TARGET_OS)) + # Override the compilers if an OPENJ9_* value is specified. + # Otherwise, toolchain.cmake has the default values. + ifneq (,$(OPENJ9_CC)) + CMAKE_ARGS += -DCMAKE_C_COMPILER="$(OPENJ9_CC)" + endif + ifneq (,$(OPENJ9_CXX)) + CMAKE_ARGS += -DCMAKE_CXX_COMPILER="$(OPENJ9_CXX)" + endif +endif # windows + +ifneq (,$(CCACHE)) + # openjdk makefiles add a bunch of environemnt variables to the ccache command. + # CMake will not parse this properly, so we wrap the whole thing in the env command. + # We also need to add semicolons between arguments or else cmake will treat the whole + # thing as one long command name. + + # Note: We remove the CCACHE_COMPRESS option that openjdk adds, because it significantly + # slows down the build (to the point of erasing any gains from using ccache). + CCACHE_NOCOMPRESS := $(filter-out CCACHE_COMPRESS=1,$(CCACHE)) + ESCAPED_CCACHE := env$(subst $(SPACE),,$(addprefix ;,$(CCACHE_NOCOMPRESS))) + + CMAKE_ARGS += -DCMAKE_C_COMPILER_LAUNCHER="$(ESCAPED_CCACHE)" + CMAKE_ARGS += -DCMAKE_CXX_COMPILER_LAUNCHER="$(ESCAPED_CCACHE)" +endif # CCACHE + +ifeq (true,$(OPENJ9_ENABLE_JFR)) + CMAKE_ARGS += -DJ9VM_OPT_JFR=ON +else # OPENJ9_ENABLE_JFR + CMAKE_ARGS += -DJ9VM_OPT_JFR=OFF +endif # OPENJ9_ENABLE_JFR + +ifeq (true,$(OPENJ9_ENABLE_JITSERVER)) + CMAKE_ARGS += -DJ9VM_OPT_JITSERVER=ON + + ifneq (,$(OPENSSL_CFLAGS)) + CMAKE_ARGS += -DOPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" endif - # Propagate configure option '--disable-warnings-as-errors-openj9' to OpenJ9. - ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9)) - CMAKE_ARGS += -DJ9VM_WARNINGS_AS_ERRORS=OFF - endif + ifneq (,$(OPENSSL_DIR)) + CMAKE_ARGS += -DOPENSSL_DIR="$(OPENSSL_DIR)" + endif - # Do this last so extra args take precedence. - CMAKE_ARGS += $(EXTRA_CMAKE_ARGS) + ifneq (,$(OPENSSL_BUNDLE_LIB_PATH)) + CMAKE_ARGS += -DOPENSSL_BUNDLE_LIB_PATH="$(OPENSSL_BUNDLE_LIB_PATH)" + endif +else + CMAKE_ARGS += -DJ9VM_OPT_JITSERVER=OFF +endif # OPENJ9_ENABLE_JITSERVER + +ifeq (true,$(OPENJ9_ENABLE_SNAPSHOTS)) + CMAKE_ARGS += -DJ9VM_OPT_SNAPSHOTS=ON +else # OPENJ9_ENABLE_SNAPSHOTS + CMAKE_ARGS += -DJ9VM_OPT_SNAPSHOTS=OFF +endif # OPENJ9_ENABLE_SNAPSHOTS + +ifeq (true,$(OPENJ9_ENABLE_CUDA)) + CMAKE_ARGS += -DJ9VM_OPT_CUDA=ON -DOMR_CUDA_HOME="$(call UnixPath,$(CUDA_HOME))" +else # OPENJ9_ENABLE_CUDA + CMAKE_ARGS += -DJ9VM_OPT_CUDA=OFF +endif # OPENJ9_ENABLE_CUDA + +ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES)) + CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=ON +else # OPENJ9_ENABLE_INLINE_TYPES + CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=OFF +endif # OPENJ9_ENABLE_INLINE_TYPES + +ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT)) + CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=ON +else # OPENJ9_ENABLE_CRAC_SUPPORT + CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=OFF +endif # OPENJ9_ENABLE_CRAC_SUPPORT + +ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT)) + CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=ON +else # OPENJ9_ENABLE_CRIU_SUPPORT + CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=OFF +endif # OPENJ9_ENABLE_CRIU_SUPPORT + +CMAKE_ARGS += -DJ9VM_OPT_METHOD_HANDLE=OFF +CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_METHODHANDLE=ON + +# Propagate configure option '--disable-warnings-as-errors-omr' to OMR. +ifeq (false,$(WARNINGS_AS_ERRORS_OMR)) + CMAKE_ARGS += -DOMR_WARNINGS_AS_ERRORS=OFF +endif + +# Propagate configure option '--disable-warnings-as-errors-openj9' to OpenJ9. +ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9)) + CMAKE_ARGS += -DJ9VM_WARNINGS_AS_ERRORS=OFF +endif + +# Do this last so extra args take precedence. +CMAKE_ARGS += $(EXTRA_CMAKE_ARGS) $(OUTPUTDIR)/vm/cmake.stamp : @$(MKDIR) -p $(@D) @@ -515,27 +362,6 @@ $(OUTPUTDIR)/vm/cmake.stamp : run-preprocessors-j9 : $(OUTPUTDIR)/vm/cmake.stamp -else # OPENJ9_ENABLE_CMAKE - -run-preprocessors-j9 : stage-j9 - @$(ECHO) Running OpenJ9 preprocessors with OPENJ9_BUILDSPEC: $(OPENJ9_BUILDSPEC) - +BOOT_JDK=$(BOOT_JDK) $(EXPORT_COMPILER_ENV_VARS) OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \ - $(MAKE) $(MAKE_ARGS) -C $(OUTPUTDIR)/vm -f $(OPENJ9_TOPDIR)/runtime/buildtools.mk \ - BUILD_ID=$(BUILD_ID) \ - DEST_DIR=$(call MixedPath,$(J9TOOLS_DIR)) \ - EXTRA_CONFIGURE_ARGS=$(OMR_EXTRA_CONFIGURE_ARGS) \ - FREEMARKER_JAR="$(FREEMARKER_JAR)" \ - J9VM_SHA=$(OPENJ9_SHA) \ - JAVA_HOME=$(BOOT_JDK) \ - OMR_DIR=$(OUTPUTDIR)/vm/omr \ - SOURCETOOLS_DIR=$(call MixedPath,$(OPENJ9_TOPDIR))/sourcetools \ - SPEC=$(OPENJ9_BUILDSPEC) \ - UMA_OPTIONS_EXTRA="-buildDate $(shell date +'%Y%m%d')" \ - VERSION_MAJOR=$(VERSION_FEATURE) \ - tools - -endif # OPENJ9_ENABLE_CMAKE - CUSTOM_COMPILER_ENV_VARS := ifneq (,$(OPENJ9_CC)) @@ -547,31 +373,11 @@ endif ifneq (,$(OPENJ9_DEVELOPER_DIR)) CUSTOM_COMPILER_ENV_VARS += DEVELOPER_DIR="$(OPENJ9_DEVELOPER_DIR)" endif -ifeq (true,$(OPENJ9_ENABLE_JITSERVER)) - ifneq (true,$(OPENJ9_ENABLE_CMAKE)) - CUSTOM_COMPILER_ENV_VARS += J9VM_OPT_JITSERVER=1 - - ifneq (,$(OPENSSL_CFLAGS)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" - endif - - ifneq (,$(OPENSSL_DIR)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_DIR="$(OPENSSL_DIR)" - endif - - ifneq (,$(OPENSSL_BUNDLE_LIB_PATH)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_BUNDLE_LIB_PATH="$(OPENSSL_BUNDLE_LIB_PATH)" - endif - endif # OPENJ9_ENABLE_CMAKE -endif # OPENJ9_ENABLE_JITSERVER ifneq (true,$(OPENJ9_ENABLE_DDR)) DDR_COMMAND := -else ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - DDR_COMMAND := $(EXPORT_COMPILER_ENV_VARS) $(MAKE) $(MAKE_ARGS) -C $(OPENJ9_VM_BUILD_DIR) j9ddr else - DDR_COMMAND := CC="$(CC)" CXX="$(CXX)" $(EXPORT_COMPILER_ENV_VARS) \ - $(MAKE) $(MAKE_ARGS) -C $(OUTPUTDIR)/vm/ddr -f run_omrddrgen.mk + DDR_COMMAND := $(EXPORT_COMPILER_ENV_VARS) $(MAKE) $(MAKE_ARGS) -C $(OPENJ9_VM_BUILD_DIR) j9ddr endif # OPENJ9_ENABLE_DDR build-j9 : run-preprocessors-j9 diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4 index 930e5126e4e..d1d142a6101 100644 --- a/closed/autoconf/custom-hook.m4 +++ b/closed/autoconf/custom-hook.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -38,7 +38,6 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK], OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS OPENJ9_PLATFORM_SETUP - OPENJ9_CONFIGURE_CMAKE OPENJ9_CONFIGURE_COMPILERS OPENJ9_CONFIGURE_CRAC_AND_CRIU_SUPPORT OPENJ9_CONFIGURE_CUDA @@ -51,55 +50,13 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK], OPENJ9_CONFIGURE_NUMA OPENJ9_CONFIGURE_SNAPSHOTS OPENJ9_CONFIGURE_WARNINGS - OPENJ9_THIRD_PARTY_REQUIREMENTS OPENJ9_CHECK_NASM_VERSION OPENJCEPLUS_SETUP ]) -AC_DEFUN([OPENJ9_CONFIGURE_CMAKE], -[ - AC_ARG_WITH(cmake, [AS_HELP_STRING([--with-cmake], [enable building openJ9 with CMake])], - [ - if test "x$with_cmake" = xyes -o "x$with_cmake" = x ; then - with_cmake=cmake - fi - ], - [ - case "$OPENJ9_PLATFORM_CODE" in - ap64|oa64|or64|wa64|xa64|xl64|xr64|xz64) - if test "x$COMPILE_TYPE" != xcross ; then - with_cmake=cmake - else - with_cmake=no - fi - ;; - *) - with_cmake=no - ;; - esac - ]) - # at this point with_cmake should either be no, or the name of the cmake command - if test "x$with_cmake" = xno ; then - OPENJ9_ENABLE_CMAKE=false - - # Currently, mixedrefs mode is only available with CMake enabled - if test "x$OMR_MIXED_REFERENCES_MODE" != xoff ; then - AC_MSG_ERROR([[--with-mixedrefs=[static|dynamic] requires --with-cmake]]) - fi - else - OPENJ9_ENABLE_CMAKE=true - if AS_EXECUTABLE_P(["$with_cmake"]) ; then - CMAKE="$with_cmake" - else - UTIL_REQUIRE_PROGS([CMAKE], [$with_cmake]) - fi - fi - - AC_SUBST(OPENJ9_ENABLE_CMAKE) -]) - AC_DEFUN([OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS], [ + UTIL_REQUIRE_PROGS(CMAKE, cmake) UTIL_REQUIRE_PROGS(M4, m4) ]) @@ -621,52 +578,6 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP], AC_SUBST(OMR_MIXED_REFERENCES_MODE) ]) -AC_DEFUN([OPENJ9_THIRD_PARTY_REQUIREMENTS], -[ - # check 3rd party library requirement for UMA - AC_ARG_WITH(freemarker-jar, [AS_HELP_STRING([--with-freemarker-jar], - [path to freemarker.jar (used to build OpenJ9 build tools)])]) - - FREEMARKER_JAR= - if test "x$OPENJ9_ENABLE_CMAKE" != xtrue ; then - AC_MSG_CHECKING([that freemarker location is set]) - if test "x$with_freemarker_jar" = x -o "x$with_freemarker_jar" = xno ; then - AC_MSG_RESULT([no]) - printf "\n" - printf "The FreeMarker library is required to build the OpenJ9 build tools\n" - printf "and has to be provided during configure process.\n" - printf "\n" - printf "Download the FreeMarker library and unpack it into an arbitrary directory:\n" - printf "\n" - printf "wget https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download -O freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "tar -xzf freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "Then run configure with '--with-freemarker-jar='\n" - printf "\n" - - AC_MSG_ERROR([Cannot continue]) - else - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([checking that '$with_freemarker_jar' exists]) - if test -f "$with_freemarker_jar" ; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([freemarker.jar not found at '$with_freemarker_jar']) - fi - fi - - if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin ; then - FREEMARKER_JAR=`$PATHTOOL -m "$with_freemarker_jar"` - else - FREEMARKER_JAR=$with_freemarker_jar - fi - fi - - AC_SUBST(FREEMARKER_JAR) -]) - AC_DEFUN([OPENJ9_CHECK_NASM_VERSION], [ OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in index b1c9f1f5194..25c840c5f6a 100644 --- a/closed/autoconf/custom-spec.gmk.in +++ b/closed/autoconf/custom-spec.gmk.in @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -88,10 +88,7 @@ J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9 # required by CMake CMAKE := @CMAKE@ -OPENJ9_ENABLE_CMAKE := @OPENJ9_ENABLE_CMAKE@ -# required by UMA -FREEMARKER_JAR := @FREEMARKER_JAR@ OPENJ9_BUILDSPEC := @OPENJ9_BUILDSPEC@ # required by JPP @@ -169,11 +166,7 @@ PERL := @PERL@ WITH_OPENSSL := @WITH_OPENSSL@ # Use '=' instead of ':=' because bootcycle-spec.gmk overrides OUTPUTDIR. -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - OPENJ9_VM_BUILD_DIR = $(OUTPUTDIR)/vm/runtime -else - OPENJ9_VM_BUILD_DIR = $(OUTPUTDIR)/vm -endif +OPENJ9_VM_BUILD_DIR = $(OUTPUTDIR)/vm/runtime # Enable use of j9cfg.h in openjdk native code. $(foreach var, \