sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version b28bf6... of apps/canutils/libcanard must not be patched due to moving can.h

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-21 09:13:47 -06:00
parent d5b7268d95
commit 00175d9cf3
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
canutils/libcanard/Makefile
View File

@ -46,6 +46,7 @@ LIBCANARD_UNPACKNAME = libcanard-$(LIBCANARD_VERSION)
LIBCANARD_PACKNAME = $(LIBCANARD_UNPACKNAME)$(PACKEXT) LIBCANARD_PACKNAME = $(LIBCANARD_UNPACKNAME)$(PACKEXT)
LIBCANARD_SRCDIR = $(LIBCANARD_UNPACKNAME) LIBCANARD_SRCDIR = $(LIBCANARD_UNPACKNAME)
LIBCANARD_DRVDIR = $(LIBCANARD_SRCDIR)$(DELIM)drivers$(DELIM)nuttx LIBCANARD_DRVDIR = $(LIBCANARD_SRCDIR)$(DELIM)drivers$(DELIM)nuttx
LIBCANARD_PATCHNAME = nuttx-$(LIBCANARD_VERSION).patch
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils
@ -78,6 +79,9 @@ $(LIBCANARD_UNPACKNAME): $(LIBCANARD_PACKNAME)
@echo "Unpacking: $< -> $@" @echo "Unpacking: $< -> $@"
$(call DELDIR, $@) $(call DELDIR, $@)
$(Q) $(UNPACK) $< $(Q) $(UNPACK) $<
$(Q) if [ -r $(LIBCANARD_PATCHNAME) ]; then \
cat $(LIBCANARD_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \
fi
$(Q) touch $@ $(Q) touch $@
$(LIBCANARD_SRCDIR)$(DELIM)canard.h: $(LIBCANARD_UNPACKNAME) $(LIBCANARD_SRCDIR)$(DELIM)canard.h: $(LIBCANARD_UNPACKNAME)

11
canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch Normal file
View File

@ -0,0 +1,11 @@
--- libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c.orig 2016-07-21 09:10:10.781658371 -0600
+++ libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c 2016-07-21 09:10:26.608658284 -0600
@@ -10,7 +10,7 @@
#include <poll.h>
#include <string.h>
#include <unistd.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
int canardNuttXInit(CanardNuttXInstance* out_ins, const char* can_iface_name)
{