[med-svn] [Git][med-team/dextractor][master] 2 commits: Use DEB_HOST_MULTIARCH to find libhdf5 libraries correctly on different archs

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / dextractor


Commits:
196d4db4 by Shayan Doust at 2020-07-27T17:04:59+01:00
Use DEB_HOST_MULTIARCH to find libhdf5 libraries correctly on different archs

- - - - -
40ee9149 by Shayan Doust at 2020-07-27T17:06:19+01:00
Update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/patches/use_system_packaged_libhdf5-dev.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+dextractor (1.0-3) UNRELEASED; urgency=medium
+
+  * Use DEB_HOST_MULTIARCH to find libhdf5 libraries correctly on different archs
+
+ -- Shayan Doust <hello at shayandoust.me>  Mon, 27 Jul 2020 17:05:52 +0100
+
 dextractor (1.0-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/use_system_packaged_libhdf5-dev.patch
=====================================
@@ -6,7 +6,7 @@ Last-Update: 2020-06-29
 
 --- dextractor.orig/Makefile
 +++ dextractor/Makefile
-@@ -1,11 +1,10 @@
+@@ -1,11 +1,11 @@
 -PATH_HDF5 = /sw/apps/hdf5/current
 -PATH_HDF5 = /usr/local/hdf5
  CFLAGS = -O3 -Wall -Wextra -fno-strict-aliasing
@@ -16,11 +16,12 @@ Last-Update: 2020-06-29
  
  dextract: dextract.c DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -I$(PATH_HDF5)/include -L$(PATH_HDF5)/lib -o dextract dextract.c DB.c QV.c -lhdf5
-+	gcc $(CFLAGS) -I/usr/include/hdf5/serial/ -L/usr/lib/${MACHINE_ARCH}-linux-gnu/hdf5/serial/ -o dextract dextract.c DB.c QV.c -lhdf5
++	#gcc $(CFLAGS) -I/usr/include/hdf5/serial/ -L/usr/lib/${MACHINE_ARCH}-linux-gnu/hdf5/serial/ -o dextract dextract.c DB.c QV.c -lhdf5
++	gcc $(CFLAGS) $(ARGS) -o dextract dextract.c DB.c QV.c -lhdf5
  
  dexta: dexta.c DB.c DB.h QV.c QV.h
  	gcc $(CFLAGS) -o dexta dexta.c DB.c QV.c
-@@ -25,7 +24,8 @@
+@@ -25,7 +25,8 @@
  	rm -f dextract.tar.gz
  
  install:


=====================================
debian/rules
=====================================
@@ -5,9 +5,16 @@ export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
 
+
+
 %:
 	dh $@
 
+override_dh_auto_build:
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+	$(MAKE) all ARGS="-I/usr/include/hdf5/serial -L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial"
+endif
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf bin



View it on GitLab: https://salsa.debian.org/med-team/dextractor/-/compare/6e256cdddb82baa573b4f02e969cb24a346f62a9...40ee9149529d498c26916bb54f8d004587b596a4

-- 
View it on GitLab: https://salsa.debian.org/med-team/dextractor/-/compare/6e256cdddb82baa573b4f02e969cb24a346f62a9...40ee9149529d498c26916bb54f8d004587b596a4
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/20200727/f82d8a98/attachment-0001.html>