| 1 |
commit: e227bcf7752f4e1389bfb61373136a1956632eb2 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 15:32:55 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 19:44:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e227bcf7 |
| 7 |
|
| 8 |
sys-devel/gettext: pass JAVACFLAGS in JAVAC variable |
| 9 |
|
| 10 |
Also avoid building java classes multiple times when muiltilib is |
| 11 |
enabled. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/770508 |
| 14 |
Closes: https://bugs.gentoo.org/855134 |
| 15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-devel/gettext/gettext-0.21-r1.ebuild | 7 ++++++- |
| 18 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/sys-devel/gettext/gettext-0.21-r1.ebuild b/sys-devel/gettext/gettext-0.21-r1.ebuild |
| 21 |
index dffca52da8a5..d8788c77d071 100644 |
| 22 |
--- a/sys-devel/gettext/gettext-0.21-r1.ebuild |
| 23 |
+++ b/sys-devel/gettext/gettext-0.21-r1.ebuild |
| 24 |
@@ -108,7 +108,7 @@ multilib_src_configure() { |
| 25 |
$(use_enable cxx libasprintf) |
| 26 |
$(use_with git) |
| 27 |
$(usex git --without-cvs $(use_with cvs)) |
| 28 |
- $(use_enable java) |
| 29 |
+ $(multilib_native_use_enable java) |
| 30 |
$(use_enable ncurses curses) |
| 31 |
$(use_enable nls) |
| 32 |
$(use_enable openmp) |
| 33 |
@@ -121,6 +121,11 @@ multilib_src_configure() { |
| 34 |
ECONF_SOURCE+=/gettext-runtime |
| 35 |
fi |
| 36 |
|
| 37 |
+ # Ensure javacomp.sh uses our desired source and target versions. |
| 38 |
+ # https://bugs.gentoo.org/855134 |
| 39 |
+ local -x JAVAC="${JAVAC} ${JAVACFLAGS}" |
| 40 |
+ export JAVA_VERBOSE=1 |
| 41 |
+ |
| 42 |
econf "${myconf[@]}" |
| 43 |
} |
Archives