| 1 |
commit: b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70 |
| 2 |
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Wed Aug 29 13:54:28 2018 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 06:16:22 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b668f7b1 |
| 7 |
|
| 8 |
dev-lang/scala: fix compile's encoding |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/664866 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/9732 |
| 12 |
|
| 13 |
Signed-off-by: Mark Wright <gienah <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-lang/scala/scala-2.12.4.ebuild | 3 +-- |
| 16 |
1 file changed, 1 insertion(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild |
| 19 |
index b36402420d4..1adbeeb8b46 100644 |
| 20 |
--- a/dev-lang/scala/scala-2.12.4.ebuild |
| 21 |
+++ b/dev-lang/scala/scala-2.12.4.ebuild |
| 22 |
@@ -145,7 +145,7 @@ src_prepare() { |
| 23 |
#!/bin/bash |
| 24 |
gjl_package=sbt |
| 25 |
gjl_jar="sbt-launch.jar" |
| 26 |
- gjl_java_args="-Dsbt.version=0.13.13 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" |
| 27 |
+ gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" |
| 28 |
source /usr/share/java-config-2/launcher/launcher.bash |
| 29 |
EOF |
| 30 |
chmod u+x "${S}/sbt" || die |
| 31 |
@@ -161,7 +161,6 @@ src_prepare() { |
| 32 |
src_compile() { |
| 33 |
if ! use binary; then |
| 34 |
export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" |
| 35 |
- export LANG="en_US.UTF-8" |
| 36 |
einfo "=== scala compile ..." |
| 37 |
"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed" |
| 38 |
einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..." |
Archives