[med-svn] [Git][med-team/dextractor][master] 3 commits: Do not hardcode architecture compiler name, use $(CC) instead

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / dextractor


Commits:
d5ca6fa1 by Nilesh Patra at 2021-02-18T17:31:38+00:00
Do not hardcode architecture compiler name, use $(CC) instead

- - - - -
deae9448 by Nilesh Patra at 2021-02-18T17:31:43+00:00
d/rules: Do not hardcode $(MAKE)

- - - - -
f577428c by Nilesh Patra at 2021-02-18T17:32:44+00:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+dextractor (1.0-4) unstable; urgency=medium
+
+  * Team Upload.
+  * Do not hardcode architecture compiler name, use $(CC) instead
+  * d/rules: Do not hardcode $(MAKE)
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Thu, 18 Feb 2021 17:32:19 +0000
+
 dextractor (1.0-3) unstable; urgency=medium
 
   * Use DEB_HOST_MULTIARCH to find libhdf5 libraries correctly on different


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,35 @@
+Description: Do not hardcode architecture compiler name, use $(CC) instead
+Author: Nilesh Patra <npatra974 at gmail.com>
+Last-Update: 2021-02-18
+--- a/Makefile
++++ b/Makefile
+@@ -1,23 +1,23 @@
+-CFLAGS = -O3 -Wall -Wextra -fno-strict-aliasing
++CFLAGS = -g -O3 -Wall -Wextra -fno-strict-aliasing
+ MACHINE_ARCH := $(shell echo `uname -m`)
+ 
+ all: dextract dexta undexta dexqv undexqv
+ 
+ dextract: dextract.c DB.c DB.h QV.c QV.h
+ 	#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
++	$(CC) $(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
++	$(CC) $(CFLAGS) -o dexta dexta.c DB.c QV.c
+ 
+ undexta: undexta.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o undexta undexta.c DB.c QV.c
++	$(CC) $(CFLAGS) -o undexta undexta.c DB.c QV.c
+ 
+ dexqv: dexqv.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o dexqv dexqv.c DB.c QV.c
++	$(CC) $(CFLAGS) -o dexqv dexqv.c DB.c QV.c
+ 
+ undexqv: undexqv.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o undexqv undexqv.c DB.c QV.c
++	$(CC) $(CFLAGS) -o undexqv undexqv.c DB.c QV.c
+ 
+ clean:
+ 	rm -f dextract dexta undexta dexqv undexqv dextract.tar.gz


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 use_system_packaged_libhdf5-dev.patch
+cross.patch


=====================================
debian/rules
=====================================
@@ -12,7 +12,7 @@ include /usr/share/dpkg/default.mk
 
 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"
+	dh_auto_build -- ARGS="-I/usr/include/hdf5/serial -L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial"
 endif
 
 override_dh_auto_clean:



View it on GitLab: https://salsa.debian.org/med-team/dextractor/-/compare/e54498182276c6dafe778650bdf8340b817ec2ad...f577428c426e382c83b35a1492db3add624b007e

-- 
View it on GitLab: https://salsa.debian.org/med-team/dextractor/-/compare/e54498182276c6dafe778650bdf8340b817ec2ad...f577428c426e382c83b35a1492db3add624b007e
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/20210218/cb4dcfa0/attachment-0001.html>