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

[Jonas Witschel]

    Date: Friday, May 8, 2020 @ 17:50:35
  Author: diabonas
Revision: 625731

upgpkg: libolm 3.1.4-3: add libprovides/deps, avoid compiling in check()

To test the library auto-generated by CFFI without installing the Python
package, the "build/lib.<platform>-<pyver>" (e.g. "build/lib.linux-x86_64-3.8")
directory must be added to the Python path. This is more elegant than the
previous version of running the CFFI helper "olm_build.py" to recreate the
library in the current directory where it can be found directly by Python: it
avoids compiling in check() and makes sure that we test exactly the same library
that is going to get installed by the package.

Modified:
  libolm/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 17:43:37 UTC (rev 625730)
+++ PKGBUILD	2020-05-08 17:50:35 UTC (rev 625731)
@@ -2,7 +2,7 @@
 pkgname=('libolm' 'python-olm')
 pkgver=3.1.4
 _tag=505e3e2b944599f4291d55b7700a79e3301f877d # git show-ref "$pkgver"
-pkgrel=2
+pkgrel=3
 pkgdesc='Implementation of the Olm and Megolm cryptographic ratchets'
 arch=('x86_64')
 url='https://gitlab.matrix.org/matrix-org/olm'
@@ -36,12 +36,12 @@
 	ctest
 
 	cd ../../python
-	python olm_build.py
-	LD_LIBRARY_PATH=../build python -m pytest
+	PYTHONPATH="$(find build -name 'lib.*' -type d -print)" LD_LIBRARY_PATH=../build python -m pytest
 }
 
 package_libolm() {
 	depends=('gcc-libs')
+	provides=('libolm.so')
 
 	cd olm/build
 	make DESTDIR="$pkgdir" install
@@ -49,7 +49,7 @@
 
 package_python-olm() {
 	pkgdesc='Python bindings for Olm'
-	depends=('libolm' 'python-cffi' 'python-future')
+	depends=('libolm' 'python-cffi' 'python-future' 'libolm.so')
 
 	cd olm/python
 	python setup.py install --root="$pkgdir" --optimize=1 --skip-build