diff options
4 files changed, 8 insertions, 38 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild index 98aa764..f504ef4 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.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 )" @@ -204,12 +200,6 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - if has_version dev-java/freemarker; then - local freemarker=freemarker - else - local freemarker=freemarker-bin - fi - # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. @@ -241,8 +231,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 +256,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[@]}" ) } 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[@]}" ) } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild index f8b40b6..d3cd752 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild @@ -83,10 +83,6 @@ DEPEND=" virtual/jdk:${SLOT} virtual/jdk:$((SLOT-1)) ) - || ( - dev-java/freemarker-bin - dev-java/freemarker - ) " REQUIRED_USE="javafx? ( alsa !headless-awt )" @@ -163,12 +159,6 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - if has_version dev-java/freemarker; then - local freemarker=freemarker - else - local freemarker=freemarker-bin - fi - # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. @@ -200,8 +190,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) ) @@ -225,6 +215,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[@]}" ) } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild index f7ee71c..c0cf1d1 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild @@ -83,10 +83,6 @@ DEPEND=" virtual/jdk:${SLOT} virtual/jdk:$((SLOT-1)) ) - || ( - dev-java/freemarker-bin - dev-java/freemarker - ) " REQUIRED_USE="javafx? ( alsa !headless-awt )" @@ -162,12 +158,6 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - if has_version dev-java/freemarker; then - local freemarker=freemarker - else - local freemarker=freemarker-bin - fi - # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. @@ -199,8 +189,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) ) @@ -224,6 +214,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[@]}" ) } |