Merge pull request #4309 from kfeuz/deb_build

Fixes non-arm linux deb build process
This commit is contained in:
Ben Fry
2016-03-06 16:00:24 -05:00
+2 -2
View File
@@ -948,13 +948,13 @@
<!-- Set properties for DEBIAN/control file -->
<condition property="linux.deb" value="linux/processing-${version}-linux-armv6hf.deb">
<equals arg1="linux-arm32" arg2="linux-arm32" />
<equals arg1="${linux-arm32}" arg2="linux-arm32" />
</condition>
<property name="linux.deb" value="linux/processing-${version}-linux${sun.arch.data.model}.deb" />
<!-- Raspbian seems to borrow armhf for armv6hf, so this works -->
<condition property="deb.arch" value="armhf">
<equals arg1="linux-arm32" arg2="linux-arm32" />
<equals arg1="${linux-arm32}" arg2="linux-arm32" />
</condition>
<condition property="deb.arch" value="i386">
<equals arg1="${sun.arch.data.model}" arg2="32" />