Blob Blame History Raw
From: Kir Kolyshkin <kolyshkin@gmail.com>
Subject: arduino-builder: fix tools paths

This patch fixes two things for arduino-builder on Fedora:

1. Makes it use arduino-ctags from /usr/bin (as provided by Fedora).
Apparently, arduino-builder uses ctags in order to generate all the
function prototypes and insert those at the beginning of the file to
be compiled. When ordinary ctags binary is used, prototypes are generated
without the return type (i.e. "fn(void);" instead of "void fn(void);")
and it screws the avr-gcc big time.

2. Makes it use avrdude from /usr/bin (as provided by Fedora).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>


diff -ur arduino-builder-1.0.5/src/arduino.cc/builder/hardware/platform.txt arduino-builder-1.0.5-my/src/arduino.cc/builder/hardware/platform.txt
--- arduino-builder-1.0.5/src/arduino.cc/builder/hardware/platform.txt	2015-11-02 01:21:00.000000000 -0800
+++ arduino-builder-1.0.5-my/src/arduino.cc/builder/hardware/platform.txt	2017-04-06 20:13:19.554750620 -0700
@@ -1,11 +1,11 @@
 # ctags
 # ------------------------------
-tools.ctags.path={runtime.tools.ctags.path}
-tools.ctags.cmd.path={path}/ctags
+tools.ctags.path=/usr/bin
+tools.ctags.cmd.path={path}/arduino-ctags
 tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns "{source_file}"
 
 # additional entries
-tools.avrdude.path={runtime.tools.avrdude.path}
+tools.avrdude.path=/usr/bin
 
 preproc.includes.flags=-w -x c++ -M -MG -MP
 recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"