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

[David Runge]

    Date: Friday, August 31, 2018 @ 14:12:46
  Author: dvzrv
Revision: 375843

upgpkg: clthreads 2.4.2-2

Fixing the Makefile further to be able to use it, instead of applying manual steps.

Modified:
  clthreads/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-31 13:29:52 UTC (rev 375842)
+++ PKGBUILD	2018-08-31 14:12:46 UTC (rev 375843)
@@ -8,11 +8,11 @@
 
 pkgname=clthreads
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ wrapper library around the POSIX threads API"
 arch=('x86_64')
 url="https://kokkinizita.linuxaudio.org/linuxaudio/"
-license=('LGPL')
+license=('LGPL2.1')
 depends=('gcc-libs')
 source=("${url}downloads/${pkgname}-${pkgver}.tar.bz2")
 sha512sums=('a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131')
@@ -20,9 +20,11 @@
 prepare() {
   cd "${pkgname}-${pkgver}/source"
   # remove optimization
-  # remove local call to ldconfig
+  # patch call to ldconfig to be local (upstream fix requested)
+  # remove wrongly applied use of PREFIX
   sed -e '/native/d' \
-      -e '/ldconfig/d' \
+      -e 's/ldconfig/& -N $(PREFIX)\/$(LIBDIR)/' \
+      -e 's/(PREFIX)\/\$//g' \
       -i Makefile
 }
 
@@ -33,9 +35,5 @@
 
 package(){
   cd "${pkgname}-${pkgver}/source"
-  # install header, shared object and symlink manually, as Makefile is broken
-  install -vDm 644 "${pkgname}.h" -t "${pkgdir}/usr/include/"
-  install -vDm 755 "lib${pkgname}.so.${pkgver}" -t "${pkgdir}/usr/lib/"
-  ln -sv "lib${pkgname}.so.${pkgver}" "${pkgdir}/usr/lib/lib${pkgname}.so"
-  install -vDm 644 ../AUTHORS -t "${pkgdir}/usr/share/doc/${pkgname}"
+  make DESTDIR="${pkgdir}/" PREFIX='/usr' LIBDIR='/usr/lib' install
 }