Wed Jan 30 22:57:42 2008 UTC ()
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".


(tron)
diff -r1.119 -r1.120 pkgsrc/bootstrap/bootstrap
diff -r1.28 -r1.29 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.119 -r1.120 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2008/01/24 14:48:02 1.119
+++ pkgsrc/bootstrap/bootstrap 2008/01/30 22:57:31 1.120
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.119 2008/01/24 14:48:02 joerg Exp $ 3# $NetBSD: bootstrap,v 1.120 2008/01/30 22:57:31 tron Exp $
4# 4#
5# 5#
6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. 6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 3. All advertising materials mentioning features or use of this software 16# 3. All advertising materials mentioning features or use of this software
@@ -432,26 +432,27 @@ root_user=root @@ -432,26 +432,27 @@ root_user=root
432bmakexenv= 432bmakexenv=
433bmakexargs= 433bmakexargs=
434tnftpxflags= 434tnftpxflags=
435need_extras=no 435need_extras=no
436case "$opsys" in 436case "$opsys" in
437Darwin) 437Darwin)
438 root_group=wheel 438 root_group=wheel
439 need_pax=yes 439 need_pax=yes
440 need_bsd_install=no 440 need_bsd_install=no
441 need_awk=no 441 need_awk=no
442 need_sed=no 442 need_sed=no
443 set_opsys=no 443 set_opsys=no
444 machine_arch=`uname -p` 444 machine_arch=`uname -p`
 445 CC="gcc -isystem /usr/include"; export CC
445 ;; 446 ;;
446DragonFly) 447DragonFly)
447 root_group=wheel 448 root_group=wheel
448 need_pax=yes 449 need_pax=yes
449 need_bsd_install=no 450 need_bsd_install=no
450 need_awk=no 451 need_awk=no
451 need_sed=no 452 need_sed=no
452 set_opsys=no 453 set_opsys=no
453 check_prog tarprog tar 454 check_prog tarprog tar
454 machine_arch=`uname -p` 455 machine_arch=`uname -p`
455 case `uname -r` in 456 case `uname -r` in
456 1.1[0-9]*) 457 1.1[0-9]*)
457 [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp" 458 [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"
cvs diff -r1.28 -r1.29 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2007/12/16 12:36:28 1.28
+++ pkgsrc/mk/platform/Darwin.mk 2008/01/30 22:57:42 1.29
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1# $NetBSD: Darwin.mk,v 1.28 2007/12/16 12:36:28 tron Exp $ 1# $NetBSD: Darwin.mk,v 1.29 2008/01/30 22:57:42 tron Exp $
2# 2#
3# Variable definitions for the Darwin operating system. 3# Variable definitions for the Darwin operating system.
4 4
5.if !defined(CPP) || ${CPP} == "cpp" 5.if !defined(CPP) || ${CPP} == "cpp"
6CPP= ${CC} -E ${CPP_PRECOMP_FLAGS} 6CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
7.endif 7.endif
8.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 8.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
9ECHO_N?= /bin/echo -n 9ECHO_N?= /bin/echo -n
10.else 10.else
11ECHO_N?= ${ECHO} -n 11ECHO_N?= ${ECHO} -n
12.endif 12.endif
13LDD?= /usr/bin/otool -L 13LDD?= /usr/bin/otool -L
14IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 14IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
15PKGLOCALEDIR?= share 15PKGLOCALEDIR?= share
16PS?= /bin/ps 16PS?= /bin/ps
17# XXX: default from defaults/mk.conf. Verify/correct for this platform 17# XXX: default from defaults/mk.conf. Verify/correct for this platform
18# and remove this comment. 18# and remove this comment.
19SU?= /usr/bin/su 19SU?= /usr/bin/su
20TYPE?= type # Shell builtin 20TYPE?= type # Shell builtin
21IMAKEOPTS+= -DBuildHtmlManPages=NO 21IMAKEOPTS+= -DBuildHtmlManPages=NO
22.if defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss]) 22.if defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])
23IMAKEOPTS+= -DInstallFlags=-c # do not set user or group 23IMAKEOPTS+= -DInstallFlags=-c # do not set user or group
24.endif 24.endif
25 25
26.if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc) 26.if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
27CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp 27# Use the GNU cpp, not the OS X cpp, don't look in "/usr/local/include"
 28# before "/usr/include".
 29CPP_PRECOMP_FLAGS?= -no-cpp-precomp -isystem /usr/include
28.endif 30.endif
29DEF_UMASK?= 0022 31DEF_UMASK?= 0022
30DEFAULT_SERIAL_DEVICE?= /dev/null 32DEFAULT_SERIAL_DEVICE?= /dev/null
31EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 33EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
32MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type 34MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
33NOLOGIN?= /usr/bin/false 35NOLOGIN?= /usr/bin/false
34PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 36PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
35ROOT_CMD?= /usr/bin/sudo ${SH} -c 37ROOT_CMD?= /usr/bin/sudo ${SH} -c
36ROOT_GROUP?= wheel 38ROOT_GROUP?= wheel
37ROOT_USER?= root 39ROOT_USER?= root
38SERIAL_DEVICES?= /dev/null 40SERIAL_DEVICES?= /dev/null
39ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` 41ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
40ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` 42ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`