[pkgsrc/trunk]: pkgsrc Try to fix PR pkg/26143 with caution:

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d5e185457dd
branches:  trunk
changeset: 538167:4d5e185457dd
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jan 30 22:57:31 2008 +0000

description:
Try to fix PR pkg/26143 with caution:
- Set "CC" to "gcc -isystem /usr/include" during bootstrap.
- Add "-isystem /usr/include" to the Darwin specific "CPPFLAGS".

diffstat:

 bootstrap/bootstrap   |  3 ++-
 mk/platform/Darwin.mk |  6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r cfc92d505a9e -r 4d5e185457dd bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Jan 30 22:36:14 2008 +0000
+++ b/bootstrap/bootstrap       Wed Jan 30 22:57:31 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.119 2008/01/24 14:48:02 joerg Exp $
+# $NetBSD: bootstrap,v 1.120 2008/01/30 22:57:31 tron Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -442,6 +442,7 @@
        need_sed=no
        set_opsys=no
        machine_arch=`uname -p`
+       CC="gcc -isystem /usr/include"; export CC
        ;;
 DragonFly)
        root_group=wheel
diff -r cfc92d505a9e -r 4d5e185457dd mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Wed Jan 30 22:36:14 2008 +0000
+++ b/mk/platform/Darwin.mk     Wed Jan 30 22:57:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.28 2007/12/16 12:36:28 tron Exp $
+# $NetBSD: Darwin.mk,v 1.29 2008/01/30 22:57:42 tron Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -24,7 +24,9 @@
 .endif
 
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
-CPP_PRECOMP_FLAGS?=    -no-cpp-precomp # use the GNU cpp, not the OS X cpp
+# Use the GNU cpp, not the OS X cpp, don't look in "/usr/local/include"
+# before "/usr/include".
+CPP_PRECOMP_FLAGS?=    -no-cpp-precomp -isystem /usr/include
 .endif
 DEF_UMASK?=            0022
 DEFAULT_SERIAL_DEVICE?=        /dev/null