[arch-commits] Commit in openocd/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Tuesday, April 22, 2014 @ 17:32:52
  Author: spupykin
Revision: 109962

upgpkg: openocd 0.8.0_rc1-4

upd

Modified:
  openocd/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-22 15:32:49 UTC (rev 109961)
+++ PKGBUILD	2014-04-22 15:32:52 UTC (rev 109962)
@@ -5,36 +5,28 @@
 # Contributor: Samuel Tardieu <sam at rfc1149.net>
 
 pkgname=openocd
-pkgver=0.7.0
-pkgrel=3
+pkgver=0.8.0_rc1
+pkgrel=4
 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
 arch=('i686' 'x86_64')
 url='http://openocd.berlios.de'
 license=('GPL')
-depends=('libftdi' 'libusb-compat')
+depends=('libftdi' 'libftdi-compat' 'libusb' 'libusb-compat')
 options=(!strip)
 install=openocd.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63')
+_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2)
+md5sums=('7cbf6b556f020298eab80df94b73d52c')
 
-_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink)
-
-# FIXME: needs /dev/bus/usb and cannot be compiled in chroot
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's|$CC -E|$CC -O2 -E|g' configure
-  sed -i 's|\${CC} -E|$CC -O2 -E|g' configure
-  sed -i 's|-lftdi -lusb|-lftdi1 -lusb-1.0|g' configure src/Makefile*
-}
-
 build() {
-  cd $pkgname-$pkgver
-  export CFLAGS="-I/usr/include/libftdi1"
+  cd $pkgname-${pkgver/_/-}
+  export LIBFTDI_CFLAGS="-I/usr/include/libftdi1"
+  export LIBFTDI_LIBS="-lftdi1"
   ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror
-  make
+  make LIBS="-ldl -lftdi1"
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname-${pkgver/_/-}
   make DESTDIR="$pkgdir" install
 }