[Git][debian-gis-team/hdf4][master] 3 commits: Revert "Explicitly build with GCC 9 (FTBFS with GCC 10, see: #957445)"

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4


Commits:
012de12f by Adrian Bunk at 2020-11-14T21:06:01+02:00
Revert "Explicitly build with GCC 9 (FTBFS with GCC 10, see: #957445)"

This reverts commit 0ec5474f11c414c5118bb25feb90d47374cfba84.

- - - - -
a911d427 by Adrian Bunk at 2020-11-14T21:06:39+02:00
Fix the build with gcc 10

- - - - -
7be19789 by Adrian Bunk at 2020-11-14T21:08:11+02:00
Go back to non-parallel test execution, parallal execution is racy

- - - - -


3 changed files:

- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -8,9 +8,7 @@ Build-Depends: debhelper (>= 10~),
                bison,
                chrpath,
                flex,
-               g++-9,
-               gcc-9,
-               gfortran-9,
+               gfortran,
                libaec-dev,
                libjpeg-dev,
                sharutils,


=====================================
debian/control.in
=====================================
@@ -8,9 +8,7 @@ Build-Depends: debhelper (>= 10~),
                bison,
                chrpath,
                flex,
-               g++-9,
-               gcc-9,
-               gfortran-9,
+               gfortran,
                libaec-dev,
                libjpeg-dev,
                sharutils,


=====================================
debian/rules
=====================================
@@ -21,11 +21,13 @@ SOVER   := 0
 DESTDIR     := $(CURDIR)/debian/tmp
 DESTDIR_ALT := $(CURDIR)/debian/tmp-alt
 
-F77  := gfortran-9
-CC   := gcc-9
-CXX  := g++-9
+F77  := gfortran
+CC   := gcc
+CXX  := g++
 LIBS := -ljpeg -lz -lm
 
+export DEB_FFLAGS_MAINT_APPEND += -fallow-argument-mismatch
+
 CFLAGS  = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)
 CFLAGS += $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)
 LDFLAGS = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
@@ -123,6 +125,7 @@ override_dh_auto_test:
 	if [ "$(DISABLE_TESTS)" = 0 ]; then \
 		dh_auto_test --sourcedirectory=HDF4 \
 		             --builddirectory=debian/build-hdf4 \
+		             --no-parallel \
 		             -- F77="$(F77)" CC="$(CC)" CXX="$(CXX)" \
 		                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		                LIBS="$(LIBS)" ; \
@@ -131,6 +134,7 @@ override_dh_auto_test:
 	if [ "$(DISABLE_TESTS)" = 0 ]; then \
 		dh_auto_test --sourcedirectory=HDF4_ALT \
 		             --builddirectory=debian/build-hdf4-alt \
+		             --no-parallel \
 		             -- CC="$(CC)" CXX="$(CXX)" \
 		                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		                LIBS="$(LIBS)" ; \



View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/be87d2efa0453fac2ebabd2fcb8219bd8e57e268...7be197895c5dd78c13c0aae16fde99632ec6c026

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/be87d2efa0453fac2ebabd2fcb8219bd8e57e268...7be197895c5dd78c13c0aae16fde99632ec6c026
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/pkg-grass-devel/attachments/20201115/3a04aeb1/attachment-0001.html>