On Thu, Oct 21, 2021 at 10:33:10AM -0600, Tracey Emery wrote:
> On Thu, Oct 21, 2021 at 10:25:04AM -0600, Tracey Emery wrote:
> > On Thu, Oct 21, 2021 at 11:02:53AM -0500, joshua stein wrote:
> > > On Thu, 21 Oct 2021 at 17:44:29 +0200, Paco Esteban wrote:
> > > > On Wed, 13 Oct 2021, Tracey Emery wrote:
> > > >
> > > > > Hello,
> > > > >
> > > > > Here is an update for devel/makeesparduino, to 6.5.0. This update is a
> > > > > major redo of the original makefile, which includes support for
> > > > > OpenBSD,
> > > > > which gets rid of local patching.
> > > > >
> > > > > This update does not need to wait for the xtensa-lx106-elf and has
> > > > > been
> > > > > tested on amd64 and sparc64. This has only been tested on amd64 for
> > > > > xtensa-esp32-elf.
> > > > >
> > > > > Also, the MESSAGE file has been edited to inform the user of the
> > > > > requirement of a LOCALBASE environment setting.
> > > > >
> > > > > Ok?
> > > >
> > > > ok paco@
> > >
> > > I replied to Tracey already but this LOCALBASE thing seems like a
> > > regression. I don't think the user should have to supply such a
> > > thing manually to avoid warnings, it should just be patched into the
> > > port.
> > >
> > > $ gmake
> > > - Parsing Arduino configuration files ...
> > > - Finding all involved files for the build ...
> > > * Warning: Ignoring non existing file specification /avr/include
> > > * Warning: Ignoring non existing file specification
> > > /share/arduino/libraries
> >
> > Want to ok this while I wait?
> >
> > --
> >
> > Tracey Emery
Sigh, and MESSAGE edited.
--
Tracey Emery
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile 21 Oct 2021 14:03:04 -0000 1.3
+++ Makefile 21 Oct 2021 16:49:33 -0000
@@ -5,6 +5,7 @@ COMMENT = makefile for ESP8266 and ESP3
GH_ACCOUNT = plerup
GH_PROJECT = makeEspArduino
GH_TAGNAME = 6.5.0
+REVISION = 0
PKGNAME = makeesparduino-${GH_TAGNAME}
@@ -22,6 +23,9 @@ RUN_DEPENDS += devel/arduino \
NO_TEST = Yes
NO_BUILD = Yes
+
+post-patch:
+ ${SUBST_CMD} ${WRKDIST}/os/OpenBSD.mk
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/makeEspArduino
Index: patches/patch-os_OpenBSD_mk
===================================================================
RCS file: patches/patch-os_OpenBSD_mk
diff -N patches/patch-os_OpenBSD_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-os_OpenBSD_mk 21 Oct 2021 16:49:33 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Index: os/OpenBSD.mk
+--- os/OpenBSD.mk.orig
++++ os/OpenBSD.mk
+@@ -13,11 +13,11 @@
+
#====================================================================================
+
+ CONFIG_ROOT ?= $(HOME)/Library
+-ARDUINO_ROOT ?= $(LOCALBASE)/share/arduino
++ARDUINO_ROOT ?= ${LOCALBASE}/share/arduino
+ ARDUINO_HW_ESP_ROOT = $(ARDUINO_ROOT)/hardware/espressif/$(CHIP)
+ UPLOAD_PORT_MATCH ?= /dev/tty*U*
+ CMD_LINE = $(shell ps $$PPID -o command | tail -1)
+ OS_NAME = openbsd
+ BUILD_THREADS ?= $(shell sysctl -n hw.ncpuonline)
+-ARDUINO_LIBS = $(LOCALBASE)/share/arduino/libraries
+-CUSTOM_LIBS += $(LOCALBASE)/avr/include
+\ No newline at end of file
++ARDUINO_LIBS = ${LOCALBASE}/share/arduino/libraries
++CUSTOM_LIBS += ${LOCALBASE}/avr/include
+\ No newline at end of file
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -u -r1.2 MESSAGE
--- pkg/MESSAGE 21 Oct 2021 14:03:04 -0000 1.2
+++ pkg/MESSAGE 21 Oct 2021 16:49:33 -0000
@@ -3,8 +3,3 @@ desired Espressif chipset.
If you haven't already, please use pkg_add to install arduino-esp8266,
arduino-esp32, or both.
-
-Also, the LOCALBASE path will need to be added to your environment. For
-temporary usage, do:
-
-$ env LOCALBASE=${LOCALBASE} gmake -f
${LOCALBASE}/share/makeEspArduino/makeEspArduino.mk
