Thu Sep 15 11:53:05 2022 UTC ()
bootstrap: Put back /usr/include hack on old OSX.


(jperkin)
diff -r1.314 -r1.315 pkgsrc/bootstrap/bootstrap
cvs diff -r1.314 -r1.315 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2022/09/12 12:32:30 1.314
+++ pkgsrc/bootstrap/bootstrap 2022/09/15 11:53:05 1.315
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.314 2022/09/12 12:32:30 jperkin Exp $ 3# $NetBSD: bootstrap,v 1.315 2022/09/15 11:53:05 jperkin Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# 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# 16#
@@ -607,26 +607,33 @@ Darwin) @@ -607,26 +607,33 @@ Darwin)
607 need_awk=yes 607 need_awk=yes
608 need_sed=yes 608 need_sed=yes
609 fi 609 fi
610 610
611 # Avoid system shells on macOS versions that enable System Integrity 611 # Avoid system shells on macOS versions that enable System Integrity
612 # Protection (SIP) as it affects packages that rely on variables such 612 # Protection (SIP) as it affects packages that rely on variables such
613 # as LD_LIBRARY_PATH. SIP unsets any variables that may affect 613 # as LD_LIBRARY_PATH. SIP unsets any variables that may affect
614 # security when using system binaries, i.e. /bin/*sh, but using a 614 # security when using system binaries, i.e. /bin/*sh, but using a
615 # non-system shell is unaffected, at least for now. 615 # non-system shell is unaffected, at least for now.
616 if [ $macos_version -ge 1011 ]; then 616 if [ $macos_version -ge 1011 ]; then
617 need_mksh=yes 617 need_mksh=yes
618 fi 618 fi
619 619
 620 # Old compiler versions looked in /usr/local/include where software
 621 # installed from MacPorts could affect builds. PR#26143
 622 if [ $macos_version -lt 1006 ]; then
 623 CC=${CC:-"cc -isystem /usr/include"}
 624 export CC
 625 fi
 626
620 unset macos_version 627 unset macos_version
621 ;; 628 ;;
622DragonFly) 629DragonFly)
623 root_group=wheel 630 root_group=wheel
624 check_prog tarprog tar 631 check_prog tarprog tar
625 machine_arch=`uname -p` 632 machine_arch=`uname -p`
626 ;; 633 ;;
627FreeBSD) 634FreeBSD)
628 root_group=wheel 635 root_group=wheel
629 machine_arch=`uname -p` 636 machine_arch=`uname -p`
630 check_compiler=yes 637 check_compiler=yes
631 ;; 638 ;;
632FreeMiNT) 639FreeMiNT)