commit:     e227bcf7752f4e1389bfb61373136a1956632eb2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 15:32:55 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:44:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e227bcf7

sys-devel/gettext: pass JAVACFLAGS in JAVAC variable

Also avoid building java classes multiple times when muiltilib is
enabled.

Bug: https://bugs.gentoo.org/770508
Closes: https://bugs.gentoo.org/855134
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-devel/gettext/gettext-0.21-r1.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-devel/gettext/gettext-0.21-r1.ebuild 
b/sys-devel/gettext/gettext-0.21-r1.ebuild
index dffca52da8a5..d8788c77d071 100644
--- a/sys-devel/gettext/gettext-0.21-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.21-r1.ebuild
@@ -108,7 +108,7 @@ multilib_src_configure() {
                $(use_enable cxx libasprintf)
                $(use_with git)
                $(usex git --without-cvs $(use_with cvs))
-               $(use_enable java)
+               $(multilib_native_use_enable java)
                $(use_enable ncurses curses)
                $(use_enable nls)
                $(use_enable openmp)
@@ -121,6 +121,11 @@ multilib_src_configure() {
                ECONF_SOURCE+=/gettext-runtime
        fi
 
+       # Ensure javacomp.sh uses our desired source and target versions.
+       # https://bugs.gentoo.org/855134
+       local -x JAVAC="${JAVAC} ${JAVACFLAGS}"
+       export JAVA_VERBOSE=1
+
        econf "${myconf[@]}"
 }
 

Reply via email to