Merge branch 'aggraef/purr-data-arm64-debian-build-fixes'

debuild/debian/rules

@@ -10,6 +10,9 @@ nwjspkg = nwjs-sdk-v$(nwjsver)-linux
 ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","armhf")
 arch = arm
 nwjsver = 0.27.6
+else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","arm64")
+arch = arm
+nwjsver = 0.27.6
 else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","amd64")
 arch = x64
 else
@@ -37,6 +40,7 @@ override_dh_auto_test:
 
 override_dh_auto_build:
 # Copy the nw.js sources to where purr-data wants them.
+	@echo "DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)"
 	tar -xf debian/nwjs/$(nwjspkg)-$(arch).tar.gz && rm -rf pd/nw/nw && mv $(nwjspkg)-$(arch) pd/nw/nw
 	cd l2ork_addons && (export V=0 inst_dir=$(prefix); ./tar_em_up.sh -Bn)
 	make check prefix=$(prefix)

l2ork_addons/tar_em_up.sh

@@ -378,10 +378,17 @@ then
 	if [ $inno -eq 0 -a $dmg -eq 0 -a $light -eq 0 ]; then
 		cd raspberry_pi
 		./makeall.sh
+		# these don't seem to be built on some newer ARM architectures
+		# for some reason, so check to make sure that we actually have
+		# them before trying to install
+		if [ -f disis_gpio/disis_gpio.pd_linux ]; then
 		cp -f disis_gpio/disis_gpio.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
 		cp -f disis_gpio/disis_gpio-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
+		fi
+		if [ -f disis_spi/disis_spi.pd_linux ]; then
 		cp -f disis_spi/disis_spi.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
 		cp -f disis_spi/disis_spi-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
+		fi
 		cd ../
 	fi