summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2018-04-16 17:46:05 +0200
committerAmy Liffey <amynka@gentoo.org>2018-04-16 17:47:09 +0200
commit850599bc368ee18dd3b5e49147b496b6b1b8b57c (patch)
tree01603ba50a2b6bb7aa47909af4338bf9fc98d6a8 /dev-embedded
parentFix package.use.mask for USE flags that pull in sys-fs/zfs (diff)
downloadgentoo-850599bc368ee18dd3b5e49147b496b6b1b8b57c.tar.gz
gentoo-850599bc368ee18dd3b5e49147b496b6b1b8b57c.tar.bz2
gentoo-850599bc368ee18dd3b5e49147b496b6b1b8b57c.zip
dev-embedded/arduino: fix java.library.path
Closes: https://bugs.gentoo.org/650566 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/arduino/arduino-1.8.5-r1.ebuild (renamed from dev-embedded/arduino/arduino-1.8.5.ebuild)6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev-embedded/arduino/arduino-1.8.5.ebuild b/dev-embedded/arduino/arduino-1.8.5-r1.ebuild
index 5eb1fe0db93d..1ea4adfe2d4d 100644
--- a/dev-embedded/arduino/arduino-1.8.5.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.5-r1.ebuild
@@ -86,12 +86,12 @@ src_unpack() {
for lib in "${ARDUINO_LIBRARIES[@]}"; do
lib=( $lib )
local destfolder=${lib[3]:-build/}
- cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip"
+ cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die
done
if use doc; then
local docname
for docname in "${ARDUINO_DOCS[@]}"; do
- cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip"
+ cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
done
fi
}
@@ -122,7 +122,7 @@ src_install() {
java-pkg_dolauncher ${PN} \
--pwd "${SHARE}" \
--main "processing.app.Base" \
- --java_args "-DAPP_DIR=${SHARE}"
+ --java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
# Install libraries
insinto "${SHARE}"