Mon Apr 9 07:41:25 2012 UTC ()
Pullup ticket #3725 - requested by sbd
mk/platform/Linux.mk: bug fix

Revisions pulled up:
- mk/platform/Linux.mk                                          1.50

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Mon Apr  9 04:19:25 UTC 2012

   Modified Files:
   	pkgsrc/mk/platform: Linux.mk

   Log Message:
   Oops I had the sense inverted for NOGCCERROR.

   To generate a diff of this commit:
   cvs rdiff -u -r1.49 -r1.50 pkgsrc/mk/platform/Linux.mk


(spz)
diff -r1.49 -r1.49.2.1 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.49 -r1.49.2.1 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2012/03/19 12:34:17 1.49
+++ pkgsrc/mk/platform/Linux.mk 2012/04/09 07:41:24 1.49.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Linux.mk,v 1.49 2012/03/19 12:34:17 joerg Exp $ 1# $NetBSD: Linux.mk,v 1.49.2.1 2012/04/09 07:41:24 spz Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if defined(X11_TYPE) && ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12PS?= /bin/ps 12PS?= /bin/ps
13# XXX: default from defaults/mk.conf. Verify/correct for this platform 13# XXX: default from defaults/mk.conf. Verify/correct for this platform
14# and remove this comment. 14# and remove this comment.
@@ -84,16 +84,16 @@ _OPSYS_MAX_CMDLEN_CMD?= /usr/bin/getconf @@ -84,16 +84,16 @@ _OPSYS_MAX_CMDLEN_CMD?= /usr/bin/getconf
84.if (${MACHINE_ARCH} == "x86_64") 84.if (${MACHINE_ARCH} == "x86_64")
85ABI?= 64 85ABI?= 64
86LIBABISUFFIX?= 64 86LIBABISUFFIX?= 64
87.endif 87.endif
88 88
89## Use _CMD so the command only gets run when needed! 89## Use _CMD so the command only gets run when needed!
90.if exists(/lib/libc.so.6) 90.if exists(/lib/libc.so.6)
91_GLIBC_VERSION_CMD= /lib/libc.so.6 --version | \ 91_GLIBC_VERSION_CMD= /lib/libc.so.6 --version | \
92 sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p' 92 sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p'
93GLIBC_VERSION= ${_GLIBC_VERSION_CMD:sh} 93GLIBC_VERSION= ${_GLIBC_VERSION_CMD:sh}
94.endif 94.endif
95 95
96# If this is defined pass it to the make process.  96# If this is defined pass it to the make process.
97.if !defined(NOGCCERROR) 97.if defined(NOGCCERROR)
98MAKE_ENV+= NOGCCERROR=true 98MAKE_ENV+= NOGCCERROR=true
99.endif 99.endif