[SCM] csound/master: Force loading of plugins in build dir and not system ones

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Sat Jan 27 12:51:23 UTC 2018


The following commit has been merged in the master branch:
commit 83b05bfcd63e05a57cf08e4f19e81e6221d95050
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jan 26 20:19:36 2018 -0300

    Force loading of plugins in build dir and not system ones

diff --git a/debian/rules b/debian/rules
index 6bfda6c..80fd63e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,8 +126,10 @@ else
 	ENABLE_SIMD = 0
 endif
 
+BUILDDIR=obj-$(DEB_HOST_MULTIARCH)
+
 %:
-	dh $@ --with python2,linktree,buildinfo --parallel --buildsystem=ninja --builddirectory=obj-$(DEB_HOST_MULTIARCH)
+	dh $@ --with python2,linktree,buildinfo --parallel --buildsystem=ninja --builddirectory=$(BUILDDIR)
 
 PACKAGE_DATE = $(shell env --ignore-environment TZ=UTC LANG=C date -d@$(SOURCE_DATE_EPOCH) +%F)
 PYVERSION = $(shell pyversions -vd)
@@ -152,6 +154,9 @@ override_dh_auto_build-indep:
 	rm doc/doxygen/csound/html/*.md5 \
 		doc/doxygen/csound/html/*.map
 
+override_dh_auto_test:
+	OPCODE6DIR64=$(BUILDDIR) dh_auto_test
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f Custom.cmake

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list