From f3364bb8babee2a92bba05370e2fc0adcc822f95 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 7 Aug 2021 09:11:15 -0400 Subject: dev-java/openj9-openjdk: force cmake, remove freemarker --- dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild') diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild index 61efb07..fe6e12c 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild @@ -86,10 +86,6 @@ DEPEND=" dev-java/openjdk-bin:${SLOT} dev-java/openjdk:${SLOT} ) - || ( - dev-java/freemarker-bin - dev-java/freemarker - ) " REQUIRED_USE="javafx? ( alsa !headless-awt )" @@ -241,8 +237,8 @@ src_configure() { --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") - --with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar) --disable-warnings-as-errors{,-omr,-openj9} + --with-cmake $(use_enable ddr) ) @@ -266,6 +262,7 @@ src_configure() { unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ CONFIG_SITE=/dev/null \ + EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" \ econf "${myconf[@]}" ) } -- cgit v1.2.3-54-g00ecf