On Tue, 2015-07-21 at 13:07 -0500, Steve M. Robbins wrote: > On July 20, 2015 04:09:24 PM Paul Novotny wrote: > > On Mon, 2015-07-20 at 11:34 -0500, Steve M. Robbins wrote: > > > 2. I disabled patches/0005-make-gdcm-helper-library-static.patch > > > because it > > > did not apply cleanly. I did not spend time investigating how to > > > fix > > > it or > > > whether it is even needed. > > > > I just tried this, and the patch appears to apply cleanly for me > > (maybe > > I am doing something wrong?). > > That seems likely :-) The patch file is: > > $ cat debian/patches/0005-make-gdcm-helper-library-static.patch > Description: Make itk-gdcm library a static library if system gdcm is > used > In the case of using system gdcm this library is just an empty stub > and by > making it static a lintian warning is avoided > Author: Gert Wollny <[email protected]> > > > diff --git a/Modules/ThirdParty/GDCM/src/CMakeLists.txt > b/Modules/ThirdParty/GDCM/src/CMakeLists.txt > index e98077c..70f4286 100644 > --- a/Modules/ThirdParty/GDCM/src/CMakeLists.txt > +++ b/Modules/ThirdParty/GDCM/src/CMakeLists.txt > @@ -1,5 +1,5 @@ > if(ITK_USE_SYSTEM_GDCM) > - add_library(ITKGDCM ITK-GDCM.cxx) > + add_library(ITKGDCM STATIC ITK-GDCM.cxx) > target_link_libraries(ITKGDCM gdcmDICT gdcmMSFF) > itk_module_target(ITKGDCM) > return() > $ > > > But the file-to-be-patched no longer contains "add_library": > > $ grep add_library Modules/ThirdParty/GDCM/src/CMakeLists.txt > $
Oops, yes, didn't update the original source. It looks like the add_library and ITKGDCM library was removed in this commit: http://itk.org/gitweb?p=ITK.git;a=commit;h=d3273ff8ee282c9a92141a6894 94756b277ef2e1 So, based on that commit message, and Gert's description of why the patch was added, I think this patch can be removed. As the library has been removed. I am building now to make sure the lintian warning is gone. -Paul -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
