Re: pkg/51396: pkgsrc-2016Q2 cross/mingw-gcc PLIST mismatch

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

The following reply was made to PR pkg/51396; it has been noted by GNATS.

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/51396: pkgsrc-2016Q2 cross/mingw-gcc PLIST mismatch
Date: Sun, 7 Aug 2016 16:57:45 -0400

 --MP_/s2b4kJbzQW9wRjZQXA=rnJe
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On Sun,  7 Aug 2016 19:35:01 +0000 (UTC)
 David Holland <dholland-pbugs%netbsd.org@localhost> wrote:
 
 > The following reply was made to PR pkg/51396; it has been noted by
 > GNATS.
 > 
 > From: David Holland <dholland-pbugs%netbsd.org@localhost>
 > To: gnats-bugs%NetBSD.org@localhost
 > Cc: 
 > Subject: Re: pkg/51396: pkgsrc-2016Q2 cross/mingw-gcc PLIST mismatch
 > Date: Sun, 7 Aug 2016 19:30:35 +0000
 > 
 >  On Sun, Aug 07, 2016 at 12:20:00PM +0000, Matthew Mondor wrote:
 >   > The mingw-gcc package has two extra files not included in the
 >   > PLIST:
 >   > cross/include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O0g.gch
 >   > cross/include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O2g.gch  
 >  
 >  I suspect this depends on what gcc you build it with, as the mingw
 > gcc itself hasn't changed in a long time :(
 >  
 >  (so, how do we conditionalize properly?)
 
 That is likely, I've used that package before but on older NetBSD and
 pkgsrc branches without problems, and the version was the same.  An
 alternate solution might be to make it depend on a particular GCC as
 build dependency (or on itself in double-build mode or such), perhaps...
 
 Here is a conditionalized PLIST, which was tested to work with or
 without those extra files being part of the build (and not installing
 them in any case).  On the other hand, this would fail if even extra
 files were added, or if their name changed.  I'll try to take more time
 playing with GENERATE_PLIST+= later to see if it can generate multiple
 entries automatically conditionally from a single command.
 
 Yet another option would be to post-build delete any such extra files,
 and not include them in the PLIST at all.  I also tried a --disable-pch
 CONFIGURE_ARGS which did not work.
 
 
 --MP_/s2b4kJbzQW9wRjZQXA=rnJe
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=pkgsrc-2016Q2_cross_mingw-gcc_2.diff
 
 Index: Makefile
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/pkgsrc/cross/mingw-gcc/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile	19 Jun 2016 16:23:59 -0000	1.6
 +++ Makefile	7 Aug 2016 20:41:37 -0000
 @@ -23,6 +23,10 @@
  GCC_VERSION=		3.4.5
  DIST_VERSION=		${GCC_VERSION}-20060117-2
  
 +# Make any precompiled header file installation optional, and disabled
 +PLIST_VARS+=            pch
 +PLIST.pch=		no
 +
  do-build:
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS}
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 Index: PLIST
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/pkgsrc/cross/mingw-gcc/PLIST,v
 retrieving revision 1.4
 diff -u -r1.4 PLIST
 --- PLIST	19 Jun 2016 16:20:27 -0000	1.4
 +++ PLIST	7 Aug 2016 20:42:40 -0000
 @@ -209,6 +209,8 @@
  cross/include/c++/3.4.5/i386--mingw32/bits/messages_members.h
  cross/include/c++/3.4.5/i386--mingw32/bits/os_defines.h
  cross/include/c++/3.4.5/i386--mingw32/bits/time_members.h
 +${PLIST.pch}cross/include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O0g.gch
 +${PLIST.pch}cross/include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O2g.gch
  cross/include/c++/3.4.5/iomanip
  cross/include/c++/3.4.5/ios
  cross/include/c++/3.4.5/iosfwd
 
 --MP_/s2b4kJbzQW9wRjZQXA=rnJe--