summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Price2016-01-29 23:53:05 +0000
committerWill Price2016-01-29 23:53:28 +0000
commitc7eb074fd639a0f1da4a4db649751b13392902d3 (patch)
treec5f65d648f044f5ba5077b4edfc3bb2ceefbd64e
parent06aafe390453c88d8af6348726c73c6893ccd342 (diff)
downloadaur-c7eb074fd639a0f1da4a4db649751b13392902d3.tar.gz
Symlink rxtx library with all arch suffixes
-rw-r--r--.SRCINFO6
-rw-r--r--10-msp430-launchpad.rules4
-rw-r--r--PKGBUILD9
3 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 427b90db5650..31f3241bad21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Dec 24 12:53:20 UTC 2015
+# Fri Jan 29 23:53:23 UTC 2016
pkgbase = energia
pkgdesc = Energia is a Arduino IDE clone for use with the MSP430 launchpad
pkgver = 0017
@@ -11,13 +11,15 @@ pkgbase = energia
license = GPL
depends = java-environment
depends = java-rxtx
+ depends = libusb-compat
+ depends = gcc-libs-multilib
provides = energia
options = !strip
options = staticlibs
source = energia.desktop
source = 10-msp430-launchpad.rules
md5sums = a7ce061d9fc0f9530e058204e532b40b
- md5sums = dcdf66ac4ae446dcfadbcd6a2dbb6f31
+ md5sums = 9bcbda86498c3a71b4af1309a743716d
pkgname = energia
diff --git a/10-msp430-launchpad.rules b/10-msp430-launchpad.rules
index 1b67901134ef..ec4c4548417b 100644
--- a/10-msp430-launchpad.rules
+++ b/10-msp430-launchpad.rules
@@ -1,2 +1,2 @@
-ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", GROUP="uucp", MODE="0770"
-ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", GROUP="uucp", MODE="0770"
+ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", GROUP="uucp", MODE="0660"
+ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", GROUP="uucp", MODE="0660"
diff --git a/PKGBUILD b/PKGBUILD
index 38e3e1794cc8..6dbe0dfabb42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="Energia is a Arduino IDE clone for use with the MSP430 launchpad"
arch=('i686' 'x86_64')
url="http://energia.nu/"
license=('GPL')
-depends=(java-environment java-rxtx)
+depends=(java-environment java-rxtx libusb-compat gcc-libs-multilib)
provides=('energia')
# staticlibs keeps all *.a files which are necessary since we bundle a toolchain
# !strip disable stripping of debug symbols which are useful
@@ -17,7 +17,7 @@ install='energia.install'
source=('energia.desktop'
'10-msp430-launchpad.rules')
md5sums=('a7ce061d9fc0f9530e058204e532b40b'
- 'dcdf66ac4ae446dcfadbcd6a2dbb6f31')
+ '9bcbda86498c3a71b4af1309a743716d')
if [[ $CARCH == "x86_64" ]]; then
source+=("$pkgname-$pkgver-$CARCH.tgz::http://energia.nu/downloads/downloadv3.php?file=energia-0101E$pkgver-linux64.tgz")
md5sums+=('cbb348ff40c2f9d42c025eb9a6484ae2')
@@ -46,8 +46,9 @@ _copy_src() {
}
_patch_package_for_lock_issues() {
- ln -sf /usr/lib/librxtxSerial.so "$pkgdir/opt/energia/lib/librxtxSerial64.so"
- ln -sf /usr/lib/librxtxSerial.so "$pkgdir/opt/energia/lib/librxtxSerial32.so"
+ for arch in '' 32 64; do
+ ln -sf /usr/lib/librxtxSerial.so "$pkgdir/opt/energia/lib/librxtxSerial${arch}.so"
+ done
ln -sf /usr/share/java/rxtx/RXTXcomm.jar "$pkgdir/opt/energia/lib/RXTXcomm.jar"
install -m755 "$srcdir/10-msp430-launchpad.rules" "$pkgdir/etc/udev/rules.d/"
}