Sun Apr 28 13:21:47 2013 UTC ()
Introduce COMPILER_INCLUDE_DIRS, COMPILER_LIB_DIRS and SYSTEM_DEFAULT_RPATH.
default value are _OPSYS_INCLUDE_DIRS, _OPSYS_LIB_DIRS and _OPSYS_DEFAULT_RPATH,
defined in mk/platform/${OPSYS}.mk.
(maybe defined with compiler/development tools specific variables).


(obache)
diff -r1.335 -r1.336 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.335 -r1.336 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2013/04/03 13:45:49 1.335
+++ pkgsrc/mk/bsd.prefs.mk 2013/04/28 13:21:47 1.336
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.335 2013/04/03 13:45:49 obache Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.336 2013/04/28 13:21:47 obache Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -631,26 +631,30 @@ LINKER_RPATH_FLAG= ${_OPSYS_LINKER_RPATH @@ -631,26 +631,30 @@ LINKER_RPATH_FLAG= ${_OPSYS_LINKER_RPATH
631.else 631.else
632LINKER_RPATH_FLAG?= ${_LINKER_RPATH_FLAG} 632LINKER_RPATH_FLAG?= ${_LINKER_RPATH_FLAG}
633.endif 633.endif
634 634
635# COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass 635# COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass
636# run-time library search path directives to the linker. 636# run-time library search path directives to the linker.
637# 637#
638.if defined(_OPSYS_COMPILER_RPATH_FLAG) 638.if defined(_OPSYS_COMPILER_RPATH_FLAG)
639COMPILER_RPATH_FLAG= ${_OPSYS_COMPILER_RPATH_FLAG} 639COMPILER_RPATH_FLAG= ${_OPSYS_COMPILER_RPATH_FLAG}
640.else 640.else
641COMPILER_RPATH_FLAG?= ${_COMPILER_RPATH_FLAG} 641COMPILER_RPATH_FLAG?= ${_COMPILER_RPATH_FLAG}
642.endif 642.endif
643 643
 644COMPILER_INCLUDE_DIRS?= ${_OPSYS_INCLUDE_DIRS:U/usr/include}
 645COMPILER_LIB_DIRS?= ${_OPSYS_LIB_DIRS:U/usr/lib${LIBABISUFFIX} /lib${LIBABISUFFIX}}
 646SYSTEM_DEFAULT_RPATH?= ${_OPSYS_SYSTEM_RPATH:U/usr/lib}
 647
644# WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the 648# WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the
645# linker flags to extract all symbols from a static archive. 649# linker flags to extract all symbols from a static archive.
646# 650#
647WHOLE_ARCHIVE_FLAG?= ${_OPSYS_WHOLE_ARCHIVE_FLAG} 651WHOLE_ARCHIVE_FLAG?= ${_OPSYS_WHOLE_ARCHIVE_FLAG}
648NO_WHOLE_ARCHIVE_FLAG?= ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG} 652NO_WHOLE_ARCHIVE_FLAG?= ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG}
649 653
650USE_TOOLS?= # empty 654USE_TOOLS?= # empty
651 655
652# Provide default values for TOOLs used by the top-level make. 656# Provide default values for TOOLs used by the top-level make.
653USE_TOOLS+= [ awk dirname echo grep pwd sed test true 657USE_TOOLS+= [ awk dirname echo grep pwd sed test true
654 658
655# These tools are used by the top-level make only in certain packages and 659# These tools are used by the top-level make only in certain packages and
656# should eventually be moved into those particular package Makefiles. 660# should eventually be moved into those particular package Makefiles.