Followup-For: Bug #892403
Control: reopen -1

Hi,

while trying to rebuild starpu-contrib for CUDA 9.2 it failed with some
errors related to gcc-6.

I successfully built the package with the attached patch that switched
to GCC 7, but since the build system is a bit special, I'm not going to
upload this myself.


Andreas
diff -Nru starpu-contrib-1.2.6+dfsg/debian/changelog 
starpu-contrib-1.2.6+dfsg/debian/changelog
--- starpu-contrib-1.2.6+dfsg/debian/changelog  2019-01-01 16:48:57.000000000 
+0100
+++ starpu-contrib-1.2.6+dfsg/debian/changelog  2019-01-09 23:58:43.000000000 
+0100
@@ -1,3 +1,9 @@
+starpu-contrib (1.2.6+dfsg-5) UNRELEASED; urgency=medium
+
+  * Build with CUDA 9.2 and GCC 7.  (Closes: #892403).
+
+ -- Andreas Beckmann <a...@debian.org>  Wed, 09 Jan 2019 23:58:43 +0100
+
 starpu-contrib (1.2.6+dfsg-4) unstable; urgency=medium
 
   * debian/rules: Trick nvcc into compiling with g++ 8.
diff -Nru starpu-contrib-1.2.6+dfsg/debian/control 
starpu-contrib-1.2.6+dfsg/debian/control
--- starpu-contrib-1.2.6+dfsg/debian/control    2019-01-01 16:48:57.000000000 
+0100
+++ starpu-contrib-1.2.6+dfsg/debian/control    2019-01-09 23:58:43.000000000 
+0100
@@ -20,12 +20,12 @@
 #      guile-2.2,
        opencl-c-headers, ocl-icd-opencl-dev | opencl-dev,
        gfortran,
-#      gcc-6, g++-6, gfortran-6, gcc-6-plugin-dev, gcc,
-#      gcc-6, g++-6, gfortran-6, gcc-6-plugin-dev,
-#      clang-3.8,
+#      gcc-7, g++-7, gfortran-7, gcc-7-plugin-dev, gcc,
+       gcc-7, g++-7, gfortran-7, gcc-7-plugin-dev,
+#      clang-5.0,
        help2man, doxygen, doxygen-latex,
-       nvidia-cuda-toolkit (>= 9~),
-#Build-Conflicts: gcc-7, g++-7
+       nvidia-cuda-toolkit (>= 9.2),
+#Build-Conflicts: gcc-8, g++-8
 Standards-Version: 4.2.0
 Section: contrib/libs
 Homepage: http://starpu.gforge.inria.fr/
diff -Nru starpu-contrib-1.2.6+dfsg/debian/rules 
starpu-contrib-1.2.6+dfsg/debian/rules
--- starpu-contrib-1.2.6+dfsg/debian/rules      2019-01-01 16:36:18.000000000 
+0100
+++ starpu-contrib-1.2.6+dfsg/debian/rules      2019-01-09 23:58:43.000000000 
+0100
@@ -5,15 +5,15 @@
 source=$(shell dpkg-parsechangelog -S Source)
 
 # This is the current default version, which we may have to conflict against
-DEFAULT_GCC_VERSION  := 7
+DEFAULT_GCC_VERSION  := 8
 
 # This is the version we want to build starpu against (may have to change
 # according to plugin support)
-GCC_VERSION          := 6
+GCC_VERSION          := 7
 
 # These are the best versions that nvcc supports.
-CONTRIB_GCC_VERSION  := 6
-CONTRIB_CLANG_VERSION  := 3.8
+CONTRIB_GCC_VERSION  := 7
+CONTRIB_CLANG_VERSION  := 5.0
 
 ifeq ($(source),starpu)
 #CC=gcc-$(GCC_VERSION)
@@ -35,9 +35,9 @@
 V=1
 export V
 
-#export NVCC_CC = gcc-6
-#export NVCC_CC = clang-3.8
-export NVCCFLAGS = -Xcompiler -fPIC -Xcompiler -std=c++03 -Xcompiler 
-D__GNUC__=6
+#export NVCC_CC = gcc-7
+#export NVCC_CC = clang-5.0
+export NVCCFLAGS = -Xcompiler -fPIC -Xcompiler -std=c++03
 
 export QT_SELECT=5
 
@@ -92,8 +92,8 @@
        sed -i 's/Conflicts: libstarpu/Conflicts: libstarpu-contrib/' 
debian/control
        sed -i 's/Conflicts: libsocl/Conflicts: libsocl-contrib/' debian/control
        sed -i 's/Conflicts: starpu/Conflicts: starpu-contrib/' debian/control
-       #sed -i 's/#    gcc-$(GCC_VERSION), g++-$(GCC_VERSION), 
gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/ 
gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), 
gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control
-       #sed -i 's/^    gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/#     
gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' 
debian/control
+       sed -i 's/#     gcc-$(GCC_VERSION), g++-$(GCC_VERSION), 
gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/ 
gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), 
gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control
+       sed -i 's/^     gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/#     
gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' 
debian/control
        #sed -i 's/^    clang-$(CONTRIB_CLANG_VERSION),$$/#     
clang-$(CONTRIB_CLANG_VERSION),/' debian/control
        sed -i 's/^     nvidia-cuda-toolkit/#   nvidia-cuda-toolkit/' 
debian/control
        #sed -i 's/^Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), 
g++-$(DEFAULT_GCC_VERSION)/#Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), 
g++-$(DEFAULT_GCC_VERSION)/' debian/control
@@ -115,8 +115,8 @@
        sed -i 's/Conflicts: libstarpu-contrib/Conflicts: libstarpu/' 
debian/control
        sed -i 's/Conflicts: libsocl-contrib/Conflicts: libsocl/' debian/control
        sed -i 's/Conflicts: starpu-contrib/Conflicts: starpu/' debian/control
-       #sed -i 's/^    gcc-$(GCC_VERSION), g++-$(GCC_VERSION), 
gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/#        
gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), 
gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control
-       #sed -i 's/#    gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/      
gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' 
debian/control
+       sed -i 's/^     gcc-$(GCC_VERSION), g++-$(GCC_VERSION), 
gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/#        
gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), 
gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control
+       sed -i 's/#     gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/      
gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), 
gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' 
debian/control
        #sed -i 's/^#   clang-$(CONTRIB_CLANG_VERSION),$$/      
clang-$(CONTRIB_CLANG_VERSION),/' debian/control
        sed -i 's/#     nvidia-cuda-toolkit/    nvidia-cuda-toolkit/' 
debian/control
        #sed -i 's/^#Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), 
g++-$(DEFAULT_GCC_VERSION)/Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), 
g++-$(DEFAULT_GCC_VERSION)/' debian/control

Reply via email to