[med-svn] [Git][med-team/gwama][master] 4 commits: Use right variable CXX for g++ rathter than CC

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / gwama


Commits:
906f0b29 by Nilesh Patra at 2021-02-18T20:56:23+05:30
Use right variable CXX for g++ rathter than CC

- - - - -
c1cfb5f4 by Nilesh Patra at 2021-02-18T20:56:50+05:30
d/rules: Use dh_auto_build rather than hardcoding $(MAKE)

- - - - -
ac1ac7ea by Nilesh Patra at 2021-02-18T20:59:06+05:30
Add myself to uploaders

- - - - -
b4cc842c by Nilesh Patra at 2021-02-18T21:00:49+05:30
Update changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/04-Fix-non-cross-build.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+gwama (2.2.2+dfsg-4) unstable; urgency=medium
+
+  * Use right variable CXX for g++ rathter than CC
+  * d/rules: Use dh_auto_build rather than hardcoding $(MAKE)
+    - The above two changes fix non-crossbuildability
+  * Add myself to uploaders
+  * Declare compliance with policy 4.5.1
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Thu, 18 Feb 2021 20:57:02 +0530
+
 gwama (2.2.2+dfsg-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -1,11 +1,12 @@
 Source: gwama
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Dylan Aïssi <daissi at debian.org>
+Uploaders: Dylan Aïssi <daissi at debian.org>,
+           Nilesh Patra <npatra974 at gmail.com>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/gwama
 Vcs-Git: https://salsa.debian.org/med-team/gwama.git
 Homepage: https://www.geenivaramu.ee/en/tools/gwama


=====================================
debian/patches/04-Fix-non-cross-build.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Use right variable CXX for g++ rathter than CC
+Author: Nilesh Patra <npatra974 at gmail.com>
+Last-Update: 2021-02-18
+--- a/Makefile
++++ b/Makefile
+@@ -2,11 +2,11 @@
+ 
+ VERSION = 2.7
+ 
+-CC = g++
++CXX = g++
+ 
+ DEBUGFLAGS = -Wno-deprecated -O3 -lz
+ 
+ GWAMA:	main.cpp
+ 
+-	g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) main.cpp marker.cpp statistics.cpp study.cpp chisquaredistr.cpp normaldistr.cpp gammaf.cpp igammaf.cpp ap.cpp global.cpp problem.cpp tools.cpp cohort.cpp commandLine.cpp readFile.cpp $(DEBUGFLAGS) -o GWAMA
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) main.cpp marker.cpp statistics.cpp study.cpp chisquaredistr.cpp normaldistr.cpp gammaf.cpp igammaf.cpp ap.cpp global.cpp problem.cpp tools.cpp cohort.cpp commandLine.cpp readFile.cpp $(DEBUGFLAGS) -o GWAMA
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 01_Makefile_Add_FLAGS_to_activate_Hardening.patch
 03.Fix_lintian_spelling-error-in-binary.patch
+04-Fix-non-cross-build.patch


=====================================
debian/rules
=====================================
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+-include /usr/share/dpkg/buildtools.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Don't override the upstream FLAG -O3
@@ -9,7 +10,7 @@ CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS 2>/dev/null | sed -e 's/-O2//g')
 	dh $@
 
 override_dh_auto_build:
-	make CXXFLAGS="$(CXXFLAGS)"
+	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)"
 
 override_dh_installchangelogs:
 	# Install upstream log2.txt file as changelog



View it on GitLab: https://salsa.debian.org/med-team/gwama/-/compare/da764a86b8810067fc33ed4153a3127d4ece4cf4...b4cc842cbb95388814701edf56d8ca6186ec5a56

-- 
View it on GitLab: https://salsa.debian.org/med-team/gwama/-/compare/da764a86b8810067fc33ed4153a3127d4ece4cf4...b4cc842cbb95388814701edf56d8ca6186ec5a56
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/42818f74/attachment-0001.html>