On 2018/11/07 09:09, joshua stein wrote:
> On Thu, 18 Oct 2018 at 15:17:32 -0500, joshua stein wrote:
> > This updates the devel/arduino port to 1.8.7 and incorporates the
> > new split of ArduinoCore-avr 1.6.23. I'm including it as a tarball
> > instead of a diff because you also have to blow away files/ and
> > patches/.
> >
> > There is a new port of Arduino-Makefile, which is a project which
> > works like the custom Makefile that we currently ship in
> > devel/arduino/files/Makefile but it's cross-platform and won't be
> > something we need to keep updating ourselves. The only downside is
> > that project will require gmake now.
>
> I've only received positive feedback on these changes, does anyone
> have any objections to committing these updates?
>
arduino-makefile/patches/patch-Arduino_mk
+ AVRDUDE_CONF = /etc/avrdude.conf
arduino-makefile/patches/patch-Common_mk
+ ARDUINO_DIR = /usr/local/share/arduino
Please change the patches to use ${SYSCONFDIR} / ${LOCALBASE} and use
this in the port Makefile:
do-configure:
${SUBST_CMD} ${WRKSRC}/Common.mk ${WRKSRC}/Arduino.mk
Also in arduino-makefile/patches/patch-Arduino_mk
- AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat
$(VERSION_FILE) | sed -e 's/^[0-9]://g' -e 's/[.]//g' -e 's/\+.*//g' | head -c5)
+ AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat
$(VERSION_FILE) | sed -e 's/^[0-9]://g' -e 's/[.]//g' -e 's/\+.*//g' | head -n5)
you're changing it from 5 bytes (head -c) to 5 lines (head -n),
Our head(1) doesn't have a suitable flag but you could use "dd bs=1
count=5 status=none" (or RUN_DEPENDS on coreutils and patch to use
ghead instead).
arduino-makefile/patches/patch-bin_ard-reset-arduino
+#!/usr/bin/env python2.7
arduino-makefile/patches/patch-bin_robotis-loader
+#!/usr/bin/python2.7
Please remove the above two patches and use this instead
MODULES= lang/python
MODPY_BUILDDEP= No
MODPY_ADJ_FILES= bin/ard-reset-arduino bin/robotis-loader
The rest looks good to me.
