[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFS: Bug#957360: insighttoolkit4: ftbfs with GCC-10



Hi Étienne,

(& hopefully Gert will chime in!)

On Thursday, August 6, 2020 2:09:46 P.M. CDT Étienne Mollier wrote:

> Good day,
> 
> This night's build of insighttoolkit 4.13.3 in the clean chroot
> went through, and test suite validated without particular
> issues.  I pushed the part of my work fixing #957360 on Salsa:
> 
> 	https://salsa.debian.org/med-team/insighttoolkit

I've looked through all the changes now.  I have some questions.

Inline ITK data v4.13.3
7c3eb773ef1a698af32360ecd020bab997aed584

It looks like you unpacked the data into data/ in the upstream branch.   
However, the upstream/4.13.3-dfsg1 tag is prior to this commit, so the 
orig.tar generation does NOT include the data.  It seems to me that we should 
take one of two approaches:

1. Retain the upstream "source" and "data" tarballs, in which case the above 
commit should be reverted so as to keep the upstream branch consistent with 
the upstream "source-only" tarball.

2. Merge the data and source.  But then the source would be named using the 
tag on the above commit (i.e. upstream/4.13.3-dfsg1+data)

The first approach was used previously -- which is why there are two "orig" 
tarballs -- but the second has merit also in that we have only a single, 
bigger, tarball.  Opinions welcome -- I'm ok with either approach.


updated d/patches/remove_gcc_version_test.patch
36497a6d100b0c33c72072c0db7104b2c3f05e6d

This is a question more for Gert, but it doesn't seem wise to me to remove the 
#define VCL_GCC from vcl_compiler.h as this symbol is tested in a few places.
Nor does it seem wise to pretend to be GCC 7.3 (by defining VCL_GCC_73).  
Rather, why not change the patch to do the following:

(a) change error "Dunno about this gcc" to a warning
(b) patch out test_preprocessor.cxx entirely; it is brittle and not a very 
useful test anyway


d/patches/series: mention unused patch as comment
18a91242b65b570d98a2099f4a6d630a43fd0f97

This patch was removed from series previously saying it was incorporated 
upstream.  I will just delete the patch and the comment from d/p/series.


Rest of the commits look solid.  Once we iron out the above issues, I would be 
comfortable in doing the upload.

-Steve

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: