From 6ab791adb363e4fff50c6f588bb5e1444a47506c Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 18 Nov 2019 20:43:32 +0100 Subject: [PATCH] arduino: update paths and dependencies for openjdk8 --- srcpkgs/arduino/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template index d877176f70c..355c9d9afd5 100644 --- a/srcpkgs/arduino/template +++ b/srcpkgs/arduino/template @@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* arm*" wrksrc=$pkgname-$version create_wrksrc=yes build_wrksrc=Arduino-$version -hostmakedepends="apache-ant unzip ImageMagick openjdk" +hostmakedepends="apache-ant unzip ImageMagick openjdk8" depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude" short_desc="IDE for the arduino open-source electronics prototyping platform" maintainer="Enno Boland " @@ -21,10 +21,10 @@ nostrip=yes do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk.sh + . /etc/profile.d/10_openjdk8.sh - export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk/include/linux" - export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk/include" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include" mkdir -p build/linux/work/lib cd ../astyle/build/gcc