pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/wxGTK30 Extend check for gcc to work with distcc/c...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71126e47d62a
branches:  trunk
changeset: 351433:71126e47d62a
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Aug 20 13:19:21 2016 +0000

description:
Extend check for gcc to work with distcc/ccache

Instead of checking that PKGSRC_COMPILER is equal to gcc, see if gcc
is contained in it.  Thus, if PKGSRC_COMPILER is "ccache gcc" or
"ccache distcc gcc", the hack will still be applied.  (As a side
effect, I can confirm that the hack is still needed on recent netbsd-7
i386.)

diffstat:

 x11/wxGTK30/hacks.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r f76c27b3b5a8 -r 71126e47d62a x11/wxGTK30/hacks.mk
--- a/x11/wxGTK30/hacks.mk      Sat Aug 20 12:43:40 2016 +0000
+++ b/x11/wxGTK30/hacks.mk      Sat Aug 20 13:19:21 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2016/06/02 11:41:26 bouyer Exp $
+# $NetBSD: hacks.mk,v 1.5 2016/08/20 13:19:21 gdt Exp $
 
 ### [Mon Dec 14 16:58:00 MET 2015 : bouyer ]
 ### g++-4.8 on NetBSD/i386 fails with an internal compiler error
@@ -6,7 +6,7 @@
 ### 
 .if ${OPSYS} == "NetBSD" 
 .  include "../../mk/compiler.mk"
-.  if ${PKGSRC_COMPILER} == "gcc" && \
+.  if !empty(PKGSRC_COMPILER:Mgcc) && \
       (!empty(CC_VERSION:Mgcc-4.8.*) || !empty(CC_VERSION:Mgcc-5.*))
 CONFIGURE_ARGS+=       --disable-precomp-headers
 .  endif



Home | Main Index | Thread Index | Old Index