Martin Uecker pushed to branch master-contrib at Debian Med / bart
Commits: 10172c65 by Martin Uecker at 2022-08-23T18:00:49+02:00 Turn off LTO builds - - - - - b7ab5ae5 by Martin Uecker at 2022-08-23T18:01:14+02:00 Fix GPU build issue - - - - - 42a9f444 by Martin Uecker at 2022-08-23T18:01:18+02:00 update uploaders - - - - - 6 changed files: - debian/changelog - debian/control - debian/patches/0007-on-Deban-never-use-git-version.patch → debian/patches/0008-on-Deban-never-use-git-version.patch - + debian/patches/0009-add-CXXFLAGS-to-nvcc-to-fix-C-build-issue.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +bart-cuda (0.7.00-6) UNRELEASED; urgency=medium + + * Turn off LTO build due to GCC bug #1017849. + * Add std=c++14 to nvcc and use gcc-10 to fix build issues. + + -- Martin Uecker <[email protected]> Tue, 23 Aug 2022 16:46:34 +0200 + bart-cuda (0.7.00-5) unstable; urgency=medium * Don't allow stderr for version check. ===================================== debian/control ===================================== @@ -1,6 +1,6 @@ Source: bart-cuda Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Martin Uecker <[email protected]> +Uploaders: Martin Uecker <[email protected]> Section: contrib/science Priority: optional Build-Depends: debhelper-compat (= 13), @@ -8,7 +8,9 @@ Build-Depends: debhelper-compat (= 13), liblapack-dev | liblapack.so, libpng-dev, liblapacke-dev, - nvidia-cuda-toolkit + nvidia-cuda-toolkit, + gcc-10, + g++-10 Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/med-team/bart Vcs-Git: https://salsa.debian.org/med-team/bart.git ===================================== debian/patches/0007-on-Deban-never-use-git-version.patch → debian/patches/0008-on-Deban-never-use-git-version.patch ===================================== ===================================== debian/patches/0009-add-CXXFLAGS-to-nvcc-to-fix-C-build-issue.patch ===================================== @@ -0,0 +1,23 @@ +From: Martin Uecker <[email protected]> +Date: Tue, 23 Aug 2022 16:51:59 +0200 +Subject: add -std=c++14 to nvcc to fix C++ build issue + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 7977abd..f81ef73 100644 +--- a/Makefile ++++ b/Makefile +@@ -329,8 +329,8 @@ NVCCFLAGS = -DUSE_CUDA -Xcompiler -fPIC -Xcompiler -fopenmp -O3 $(GPUARCH_FLAGS) + + + %.o: %.cu +- $(NVCC) $(NVCCFLAGS) -c $^ -o $@ +- $(NVCC) $(NVCCFLAGS) -M $^ -o $(DEPFILE) ++ $(NVCC) $(NVCCFLAGS) -std=c++14 -c $^ -o $@ ++ $(NVCC) $(NVCCFLAGS) -std=c++14 -M $^ -o $(DEPFILE) + + + # OpenMP ===================================== debian/patches/series ===================================== @@ -4,4 +4,5 @@ 0005-workaround-for-compiler-bug.patch 0006-do-not-update-doc-commands.txt-automatically.patch 0007-backported-test-fixes.patch -0007-on-Deban-never-use-git-version.patch +0008-on-Deban-never-use-git-version.patch +0009-add-CXXFLAGS-to-nvcc-to-fix-C-build-issue.patch ===================================== debian/rules ===================================== @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) @@ -8,6 +8,9 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) export CUDA=1 export CUDA_BASE=/usr/ +# Use gcc 10 to work around CUDA problem. +export CC=gcc-10 + # set installation prefix export PREFIX=/usr/ View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/a290bfdff69ad217ddb9b3d76050372cc8d94e81...42a9f444e3deb9cd070f09d865add7886be87fe0 -- View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/a290bfdff69ad217ddb9b3d76050372cc8d94e81...42a9f444e3deb9cd070f09d865add7886be87fe0 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
