[med-svn] [Git][med-team/glam2][master] 2 commits: Build for the right architecture

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / glam2


Commits:
d21bceea by Andreas Tille at 2019-06-27T12:33:31Z
Build for the right architecture

- - - - -
e8ec2463 by Andreas Tille at 2019-06-27T12:33:51Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/change-fixed-compilers.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+glam2 (1064-8) unstable; urgency=medium
+
+  * Team upload.
+  * Build for the right architecture
+    Closes: 931154
+
+ -- Nguyen Hoang Tung <tung.nguyenhoang at toshiba-tsdv.com>  Thu, 27 Jun 2019 14:32:02 +0200
+
 glam2 (1064-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/change-fixed-compilers.patch
=====================================
@@ -0,0 +1,68 @@
+Author: Nguyen Hoang Tung <tung.nguyenhoang at toshiba-tsdv.com>
+Date: Thu, 27 Jun 2019 15:22:04 +0700
+Bug-Debian: https://bugs.debian.org/931154
+Description: build for the right architecture
+
+diff -Nru orig/glam2-1064/purge/Makefile glam2-1064/purge/Makefile
+--- orig/glam2-1064/purge/Makefile	2019-05-24 10:16:05.000000000 +0000
++++ glam2-1064/purge/Makefile	2019-05-24 10:15:39.931223187 +0000
+@@ -3,4 +3,4 @@
+ 
+ # Command for compiling purge:
+ purge: *.c *.h Makefile
+-	cc $(CFLAGS) -o purge *.c -lm $(LDFLAGS)
++	$(CC) $(CFLAGS) -o purge *.c -lm $(LDFLAGS)
+diff -Nru orig/glam2-1064/src/Makefile glam2-1064/src/Makefile
+--- orig/glam2-1064/src/Makefile	2019-05-24 10:16:05.000000000 +0000
++++ glam2-1064/src/Makefile	2019-05-24 10:15:29.875223187 +0000
+@@ -31,39 +31,39 @@
+ 
+ # Command for compiling glam2:
+ glam2: $(GSRC) *.h Makefile
+-	cc $(CFLAGS) -o glam2 $(GSRC) -lm $(LDFLAGS)
++	$(CC) $(CFLAGS) -o glam2 $(GSRC) -lm $(LDFLAGS)
+ 
+ # Command for compiling glam2scan:
+ glam2scan: $(SSRC) *.h Makefile
+-	cc $(CFLAGS) -o glam2scan $(SSRC) -lm $(LDFLAGS)
++	$(CC) $(CFLAGS) -o glam2scan $(SSRC) -lm $(LDFLAGS)
+ 
+ # Command for compiling glam2format:
+ glam2format: $(FSRC) *.h Makefile
+-	cc $(CFLAGS) -o glam2format $(FSRC) -lm $(LDFLAGS)
++	$(CC) $(CFLAGS) -o glam2format $(FSRC) -lm $(LDFLAGS)
+ 
+ # Command for compiling glam2mask:
+ glam2mask: $(MSRC) *.h Makefile
+-	cc $(CFLAGS) -o glam2mask $(MSRC) -lm $(LDFLAGS)
++	$(CC) $(CFLAGS) -o glam2mask $(MSRC) -lm $(LDFLAGS)
+ 
+ # Here follow commands for compiling special versions of the programs
+ 
+ # Compile glam2 including FFT algorithm (requires FFTW to be installed):
+ glam2fft: $(GSRC) convolve.c *.h Makefile
+-	cc $(CFLAGS) -DFFT -o glam2fft $(GSRC) convolve.c -lm -lfftw3 $(LDFLAGS)
++	$(CC) $(CFLAGS) -DFFT -o glam2fft $(GSRC) convolve.c -lm -lfftw3 $(LDFLAGS)
+ 
+ # Compile for debugging with gdb or valgrind, with extra compiler warnings:
+ glam2_d: $(GSRC) *.h Makefile
+-	cc -Wall -W -pedantic -g -o glam2_d $(GSRC) -lm
++	$(CC) -Wall -W -pedantic -g -o glam2_d $(GSRC) -lm
+ glam2scan_d: $(SSRC) *.h Makefile
+-	cc -Wall -W -pedantic -g -o glam2scan_d $(SSRC) -lm
++	$(CC) -Wall -W -pedantic -g -o glam2scan_d $(SSRC) -lm
+ glam2format_d: $(FSRC) *.h Makefile
+-	cc -Wall -W -pedantic -g -o glam2format_d $(FSRC) -lm
++	$(CC) -Wall -W -pedantic -g -o glam2format_d $(FSRC) -lm
+ glam2mask_d: $(MSRC) *.h Makefile
+-	cc -Wall -W -pedantic -g -o glam2mask_d $(MSRC) -lm
++	$(CC) -Wall -W -pedantic -g -o glam2mask_d $(MSRC) -lm
+ 
+ # Compile for profiling with gprof, with extra compiler warnings:
+ # Use -O2 to avoid function inlining
+ glam2_p: $(GSRC) *.h Makefile
+-	cc -Wall -W -pedantic -O2 -pg -o glam2_p $(GSRC) -lm
++	$(CC) -Wall -W -pedantic -O2 -pg -o glam2_p $(GSRC) -lm
+ glam2scan_p: $(SSRC) *.h Makefile
+-	cc -Wall -W -pedantic -O2 -pg -o glam2scan_p $(SSRC) -lm
++	$(CC) -Wall -W -pedantic -O2 -pg -o glam2scan_p $(SSRC) -lm


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 hardening.patch
+change-fixed-compilers.patch


=====================================
debian/rules
=====================================
@@ -12,8 +12,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_build:
 	dh_auto_build
-	make --directory=$(SRCDIR) glam2fft
-	make --directory=purge
+	dh_auto_build -B $(SRCDIR) -- glam2fft
+	dh_auto_build -B purge
 
 override_dh_compress:
 	dh_compress --exclude=.pdf



View it on GitLab: https://salsa.debian.org/med-team/glam2/compare/8f5c78f2fd691c8594e11ded06139c130223dbab...e8ec2463c5ee1fd5d0fdcd0de2ad5e8e4a000474

-- 
View it on GitLab: https://salsa.debian.org/med-team/glam2/compare/8f5c78f2fd691c8594e11ded06139c130223dbab...e8ec2463c5ee1fd5d0fdcd0de2ad5e8e4a000474
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/20190627/17cd1544/attachment-0001.html>