[med-svn] [Git][med-team/libvcflib][master] 2 commits: unit tests: Use DEB_HOST_GNU_TYPE instead of DEB_HOST_MULTIARCH for finding the build directory

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / libvcflib


Commits:
5c9f0410 by Michael R. Crusoe at 2021-01-28T12:37:38+01:00
unit tests: Use DEB_HOST_GNU_TYPE instead of DEB_HOST_MULTIARCH for finding the build directory

- - - - -
8b9b7e9b by Michael R. Crusoe at 2021-01-28T13:03:40+01:00
routine-update: Ready to upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/tests
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libvcflib (1.0.2+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * debian/rules: unit tests: Use DEB_HOST_GNU_TYPE instead of
+    DEB_HOST_MULTIARCH for finding the build directory
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Thu, 28 Jan 2021 13:03:40 +0100
+
 libvcflib (1.0.2+dfsg-1) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/patches/tests
=====================================
@@ -10,7 +10,7 @@ Forwarded: not-needed
 -LIB=-L../build -L../googletest/googletest/make/ -lm -ltabixpp -lhts -lpthread
 -LIBGTEST=../googletest/googletest/make/gtest_main.a
 -LIBVCF=../build/libvcflib.a
-+LIB=-L../obj-$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/ -L../googletest/googletest/make/ -lm -ltabixpp -lhts -lpthread
++LIB=-L../obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/ -L../googletest/googletest/make/ -lm -ltabixpp -lhts -lpthread
 +LIBGTEST=-lgtest_main -lgtest
 +LIBVCF=-lvcflib
  


=====================================
debian/rules
=====================================
@@ -30,7 +30,7 @@ endif
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	export LD_LIBRARY_PATH=$(CURDIR)/obj-${DEB_HOST_MULTIARCH}/:$$LD_LIBRARY_PATH && cd test && $(MAKE)
+	export LD_LIBRARY_PATH=$(CURDIR)/obj-${DEB_HOST_GNU_TYPE}/:$$LD_LIBRARY_PATH && cd test && $(MAKE)
 endif
 
 override_dh_install:



View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/959ba7a307aedce71188293c69ad65e7cf00ad0c...8b9b7e9b4c8d52ac2346d50a6df98670cfff4463

-- 
View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/959ba7a307aedce71188293c69ad65e7cf00ad0c...8b9b7e9b4c8d52ac2346d50a6df98670cfff4463
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210128/d3e20232/attachment-0001.html>