Date: Sat, 10 Dec 2016 20:03:25 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428319 - in head/devel: arduino-core arduino16 Message-ID: <201612102003.uBAK3PCS027002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bsam Date: Sat Dec 10 20:03:25 2016 New Revision: 428319 URL: https://svnweb.freebsd.org/changeset/ports/428319 Log: devel/arduino16, devel/arduino-core: Do not rewrite system variable ARCH: rename ARCH -> ARDUINO_ARCH. PR: 214776 Submitted by: Melvyn Sopacua <m.r.sopacua@gmail.com> Patched by: Kyle Evans <bsdports@kyle-evans.net> (maintainer) Modified: head/devel/arduino-core/Makefile head/devel/arduino16/Makefile Modified: head/devel/arduino-core/Makefile ============================================================================== --- head/devel/arduino-core/Makefile Sat Dec 10 19:32:36 2016 (r428318) +++ head/devel/arduino-core/Makefile Sat Dec 10 20:03:25 2016 (r428319) @@ -28,11 +28,13 @@ SAMD_EXTRA_PATCHES= ${PATCHDIR}/extrapat .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" -ARCH= x86_64 +ARDUINO_ARCH= x86_64 +.else +ARDUINO_ARCH= ${ARCH} .endif post-patch: - @${REINPLACE_CMD} -e 's|%%ARCH%%|${ARCH}|g' -e 's|%%OSREL%%|${OSREL:R}|g' ${WRKSRC}/hardware/package_index_bundled.json + @${REINPLACE_CMD} -e 's|%%ARCH%%|${ARDUINO_ARCH}|g' -e 's|%%OSREL%%|${OSREL:R}|g' ${WRKSRC}/hardware/package_index_bundled.json do-install: (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR}) Modified: head/devel/arduino16/Makefile ============================================================================== --- head/devel/arduino16/Makefile Sat Dec 10 19:32:36 2016 (r428318) +++ head/devel/arduino16/Makefile Sat Dec 10 20:03:25 2016 (r428319) @@ -68,10 +68,6 @@ DOCS_DISTFILES= reference-1.6.6-3.zip:r .include <bsd.port.options.mk> -.if ${ARCH} == "amd64" -ARCH= x86_64 -.endif - .if ${PORT_OPTIONS:MDOCS} INSLIST+= reference .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612102003.uBAK3PCS027002>