raiden00pl commented on code in PR #3030:
URL: https://github.com/apache/nuttx-apps/pull/3030#discussion_r2007776115
##########
canutils/lely-canopen/Makefile:
##########
@@ -170,25 +170,34 @@ MAINSRC = $(LELYCANOPEN_SRCDIR)/tools/coctl.c
endif
# Download and unpack tarball if no git repo found
-ifeq ($(wildcard $(LELYCANOPEN_SRCNAME)/.git),)
+ifeq ($(wildcard $(LELYCANOPEN_SRCNAME)),)
$(LELYCANOPEN_TARBALL):
@echo "Downloading: $(LELYCANOPEN_TARBALL)"
$(Q) curl -L -O
$(CONFIG_CANUTILS_LELYCANOPEN_URL)/$(LELYCANOPEN_TARBALL)
$(LELYCANOPEN_SRCNAME): $(LELYCANOPEN_TARBALL)
@echo "Unpacking: $(LELYCANOPEN_TARBALL) -> $(LELYCANOPEN_UNPACKNAME)"
$(Q) $(UNPACK) $(LELYCANOPEN_TARBALL)
+
+patch_src: $(LELYCANOPEN_SRCNAME)
# Get the name of the directory created by the tar command
$(eval LELYCANOPEN_UNPACKNAME := $(shell ls -d lely-core-master*))
$(Q) mv $(LELYCANOPEN_UNPACKNAME) $(LELYCANOPEN_SRCNAME)
- $(Q) cat 0001-NuttX-port.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME)
-p1
+ $(Q) cat
0001-tools-eliminate-multiple-definitions-of-poll-compile.patch | patch -s -N
-d $(LELYCANOPEN_SRCNAME) -p1
+ $(Q) cat 0002-tools-coctl.c-use-readline-and-fix-printf-issues.patch |
patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
+ $(Q) cat 0003-src-co-nmt.c-fix-compilation.patch | patch -s -N -d
$(LELYCANOPEN_SRCNAME) -p1
+ $(Q) cat 0004-tools-coctl.c-add-missing-mutex-init.patch | patch -s -N
-d $(LELYCANOPEN_SRCNAME) -p1
+ $(Q) cat 0005-add-NuttX-support.patch | patch -s -N -d
$(LELYCANOPEN_SRCNAME) -p1
$(Q) echo "Patching $(LELYCANOPEN_SRCNAME)"
-endif
+context:: patch_src
+else
context:: $(LELYCANOPEN_SRCNAME)
+endif
+
distclean::
-ifeq ($(wildcard $(LELYCANOPEN_SRCNAME)/.git),)
Review Comment:
for some reason this stopped work correctly. But the real problem was
probably in `eval LELYCANOPEN_UNPACKNAME` and parallel execution because now I
see it works as expected.
I restored changes realted to `.git`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
