pkgsrc-Changes archive

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

CVS commit: pkgsrc/x11/wxGTK30



Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Aug 20 13:19:21 UTC 2016

Modified Files:
        pkgsrc/x11/wxGTK30: hacks.mk

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/wxGTK30/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK30/hacks.mk
diff -u pkgsrc/x11/wxGTK30/hacks.mk:1.4 pkgsrc/x11/wxGTK30/hacks.mk:1.5
--- pkgsrc/x11/wxGTK30/hacks.mk:1.4     Thu Jun  2 11:41:26 2016
+++ pkgsrc/x11/wxGTK30/hacks.mk Sat Aug 20 13:19:21 2016
@@ -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