 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.218 2013/02/02 01:04:59 hans Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.219 2013/04/28 13:37:34 obache Exp $
+#
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -285,27 +285,27 @@ USE_BUILTIN.${_pkg_}?=		no
 .  if !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
 _BLNK_PKG_DBDIR.${_pkg_}?=	_BLNK_PKG_DBDIR.${_pkg_}_not_found
 _BLNK_PKG_INFO.${_pkg_}?=	${TRUE}
 BUILDLINK_PKGNAME.${_pkg_}?=	${_pkg_}
 BUILDLINK_IS_DEPOT.${_pkg_}?=	no
 # Usual systems has builtin packages in /usr
 .    if exists(/usr)
 BUILDLINK_PREFIX.${_pkg_}?=	/usr
 # Haiku OS has posix packages in /boot/common
 .    elif exists(/boot/common)
 BUILDLINK_PREFIX.${_pkg_}?=	/boot/common
 .    else
 # XXX: elsewhere?
-BUILDLINK_PREFIX.${_pkg_}?=	/
+BUILDLINK_PREFIX.${_pkg_}?=	# empty
 .    endif
 .    if !empty(LIBABISUFFIX)
 BUILDLINK_LIBDIRS.${_pkg_}?=	lib${LIBABISUFFIX}
 .    endif
 .  endif
+#
 # Set a default for _BLNK_PKG_DBDIR.<pkg>, which is the directory
 # containing the package metadata.
+#
 .  if !defined(_BLNK_PKG_DBDIR.${_pkg_})
 _BLNK_PKG_DBDIR.${_pkg_}?=	# empty
 .    for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
 .      if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
 @@ -613,38 +613,38 @@ BUILDLINK_FILES_CMD.${_pkg_}?=						\
 # BUILDLINK_FILES.<pkg> into one command that outputs all of the files
 # for <pkg> relative to ${BUILDLINK_PREFIX.<pkg>}.
+#
 _BLNK_FILES_CMD.${_pkg_}=	(
 _BLNK_FILES_CMD.${_pkg_}+=	${BUILDLINK_FILES_CMD.${_pkg_}};
 .for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}}
 _BLNK_FILES_CMD.${_pkg_}+=	${LS} -1 ${_filepattern_} 2>/dev/null || ${TRUE};
 .endfor
 _BLNK_FILES_CMD.${_pkg_}+=	)
 _BLNK_FILES_CMD.${_pkg_}+=	| ${SORT} -u
 ${_BLNK_COOKIE.${_pkg_}}:
 	${RUN}					\
-	case ${BUILDLINK_PREFIX.${_pkg_}} in				\
+	case "${BUILDLINK_PREFIX.${_pkg_}}" in				\
 	*not_found)							\
 		${ERROR_MSG} "${BUILDLINK_API_DEPENDS.${_pkg_}} is not installed; can't buildlink files."; \
 		exit 1;							\
 		;;							\
 	esac
 	${RUN} [ ${X11BASE:Q}"" ] || {					\
 		${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \
 		exit 1;							\
+	}
 	${RUN}								\
-	case ${BUILDLINK_PREFIX.${_pkg_}} in				\
+	case "${BUILDLINK_PREFIX.${_pkg_}}" in				\
 	${LOCALBASE})   buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;		\
 	*)              buildlink_dir="${BUILDLINK_DIR}" ;;		\
 	esac;								\
 	cd ${BUILDLINK_PREFIX.${_pkg_}};				\
 	${_BLNK_FILES_CMD.${_pkg_}} |					\
 	while read file; do						\
 		src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file";		\
 		if [ ! -f "$$src" ]; then					\
 			msg="$$src: not found";				\
 		else							\
 			if [ -z "${BUILDLINK_FNAME_TRANSFORM.${_pkg_}:Q}" ]; then \
 				dest="$$buildlink_dir/$$file";		\
 @@ -697,31 +697,33 @@ _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pk
 .if ${X11_TYPE} != "modular"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${X11BASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${X11BASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}\\2,g"
 .endif
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g"
+#
 # Modify the dependency_libs line by removing -L/usr/lib, which is implied.
+#
 .for _dir_ in ${COMPILER_LIB_DIRS}
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
-	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L/usr/lib\([${_BLNK_SEP}]\),\\1\\2,g" \
+	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${_dir_}\([${_BLNK_SEP}]\),\\1\\2,g" \
-	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L/usr/lib\([${_BLNK_SEP}]\),\\1\\2,g" \
+	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${_dir_}\([${_BLNK_SEP}]\),\\1\\2,g" \
-	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L/usr/lib/\.\([${_BLNK_SEP}]\),\\1\\2,g" \
+	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${_dir_}/\.\([${_BLNK_SEP}]\),\\1\\2,g" \
-	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L/usr/lib/\.\([${_BLNK_SEP}]\),\\1\\2,g"
+	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${_dir_}/\.\([${_BLNK_SEP}]\),\\1\\2,g"
 .endfor
+#
 # Modify the dependency_libs line by removing -L${LOCALBASE}/* and
 # -L${X11BASE}/*, since those are automatically added by the buildlink3.mk
 # files.
+#
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${X11BASE}/[^${_BLNK_SEP}]*\([${_BLNK_SEP}]\),\\1\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${X11BASE}/[^${_BLNK_SEP}]*\([${_BLNK_SEP}]\),\\1\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${LOCALBASE}/[^${_BLNK_SEP}]*\([${_BLNK_SEP}]\),\\1\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)-L${LOCALBASE}/[^${_BLNK_SEP}]*\([${_BLNK_SEP}]\),\\1\\2,g"
+#
 # Unmangle.
+#
 @@ -795,31 +797,33 @@ _BLNK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX
 .  endif
 .endfor
+#
 # Allow the depot directory for the package we're building.
+#
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_PASSTHRU_DIRS+=	${PREFIX}
 .endif
+#
 # Allow any directories specified by the package or user.
+#
 _BLNK_PASSTHRU_DIRS+=	${BUILDLINK_PASSTHRU_DIRS}
+#
-# Strip out /usr, /usr/include, and /usr/lib as they're always
+# Strip out ${COMPILER_LIB_DIRS}, and ${COMPILER_INCLUDE_DIRS} as they're always
 # automatically added to all of the search paths.  Also strip out
 # ${LOCALBASE} and ${X11BASE} to prevent silly mistakes.
+#
-_BLNK_PASSTHRU_DIRS:=	${_BLNK_PASSTHRU_DIRS:N/usr:N/usr/lib:N/usr/include:N${LOCALBASE}:N${X11BASE}}
+.for _dir_ in ${COMPILER_LIB_DIRS} ${COMPILER_INCLUDE_DIRS} ${LOCALBASE} ${X11BASE}
 _BLNK_PASSTHRU_DIRS:=	${_BLNK_PASSTHRU_DIRS:N${_dir_}}
 .endfor
+#
 # Allow all directories in the library subdirectories listed for each
 # package to be in the runtime library search path.
+#
 .for _pkg_ in ${_BLNK_PACKAGES}
 .  if !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[nN][oO])
 .    if !empty(BUILDLINK_LIBDIRS.${_pkg_})
 .      for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}}
 .        if exists(${BUILDLINK_PREFIX.${_pkg_}}/${_dir_})
 _BLNK_PASSTHRU_RPATHDIRS+=	${BUILDLINK_PREFIX.${_pkg_}}/${_dir_}
 .        endif
 .      endfor
 .    endif
 @@ -836,38 +840,40 @@ _BLNK_PASSTHRU_RPATHDIRS+=	${LOCALBASE}/
 # packages so that X11 libraries can be found.
+#
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_PASSTHRU_RPATHDIRS+=	${X11BASE}/lib
 .endif
+#
 # Allow any directories specified by the package or user.
+#
 _BLNK_PASSTHRU_RPATHDIRS+=	${BUILDLINK_PASSTHRU_RPATHDIRS}
+#
 # Strip out /usr/lib (and /usr/lib${LIBABISUFFIX}}) as it's always
 # automatically in the runtime library search path.
+#
-_BLNK_PASSTHRU_RPATHDIRS:=	${_BLNK_PASSTHRU_RPATHDIRS:N/usr/lib:N/usr/lib${LIBABISUFFIX}}
+.for _dir_ in ${SYSTEM_DEFAULT_RPATH:ts:}
 _BLNK_PASSTHRU_RPATHDIRS:=	${_BLNK_PASSTHRU_RPATHDIRS:N${_dir_}}
 .endfor
 _BLNK_MANGLE_DIRS=	# empty
 _BLNK_MANGLE_DIRS+=	${BUILDLINK_DIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_MANGLE_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_MANGLE_DIRS+=	${WRKDIR}
 _BLNK_MANGLE_DIRS+=	${_BLNK_PASSTHRU_DIRS}
 _BLNK_MANGLE_DIRS+=	${_BLNK_PASSTHRU_RPATHDIRS}
-_BLNK_MANGLE_DIRS+=	/usr/include
+_BLNK_MANGLE_DIRS+=	${COMPILER_INCLUDE_DIRS}
-_BLNK_MANGLE_DIRS+=	/usr/lib${LIBABISUFFIX}
+_BLNK_MANGLE_DIRS+=	${COMPILER_LIB_DIRS}
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_MANGLE_DIRS+=	${PREFIX}
 .endif
 _BLNK_MANGLE_DIRS+=	${LOCALBASE}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_MANGLE_DIRS+=	${X11BASE}
 .endif
 _BLNK_MANGLE_START=	_bUiLdLiNk_
 _BLNK_MANGLE_END=	\#
 .for _dir_ in ${_BLNK_MANGLE_DIRS}
 _BLNK_MANGLE_DIR.${_dir_}=	\
 	${_BLNK_MANGLE_START}${_dir_:S/\//_/g}${_BLNK_MANGLE_END}
 @@ -875,28 +881,28 @@ _BLNK_MANGLE_DIR.${_dir_}=	\
 _BLNK_MANGLE_SED_PATTERN=	\
 	${_BLNK_MANGLE_START}[^/ 	${_BLNK_MANGLE_END}]*${_BLNK_MANGLE_END}
 _BLNK_PROTECT_DIRS=	# empty
 _BLNK_UNPROTECT_DIRS=	# empty
 _BLNK_PROTECT_DIRS+=	${BUILDLINK_DIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_PROTECT_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_PROTECT_DIRS+=	${WRKDIR}
 _BLNK_PROTECT_DIRS+=	${_BLNK_PASSTHRU_DIRS}
-_BLNK_UNPROTECT_DIRS+=	/usr/include
+_BLNK_UNPROTECT_DIRS+=	${COMPILER_INCLUDE_DIRS}
-_BLNK_UNPROTECT_DIRS+=	/usr/lib${LIBABISUFFIX}
+_BLNK_UNPROTECT_DIRS+=	${COMPILER_LIB_DIRS}
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_UNPROTECT_DIRS+=	${PREFIX}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${LOCALBASE}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_UNPROTECT_DIRS+=	${X11BASE}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${_BLNK_PASSTHRU_DIRS}
 _BLNK_UNPROTECT_DIRS+=	${WRKDIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_UNPROTECT_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${BUILDLINK_DIR}
 @@ -945,48 +951,54 @@ _BLNK_TRANSFORM+=	mangle:${_dir_}:${_BLN
 # Transform /usr/lib/../lib* to /usr/lib* so the following transformation
 # work.  (added by libtool on multlib Linux systems).
+#
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 _BLNK_TRANSFORM+=	mangle:/usr/lib/../lib64:/usr/lib64
 _BLNK_TRANSFORM+=	mangle:/usr/lib/../lib:/usr/lib
 _BLNK_TRANSFORM+=	mangle:/usr/lib/../lib32:/usr/lib32
 _BLNK_TRANSFORM+=	mangle:/usr/lib/../libx32:/usr/libx32
 .endif
+#
 # Protect -I/usr/include/* and -L/usr/lib/* from transformations (these
 # aren't part of the normal header or library search paths).
+#
-_BLNK_TRANSFORM+=	opt-sub:-I/usr/include:-I${_BLNK_MANGLE_DIR./usr/include}
+.for _dir_ in ${COMPILER_INCLUDE_DIRS}
-_BLNK_TRANSFORM+=	opt-sub:-L/usr/lib:-L${_BLNK_MANGLE_DIR./usr/lib}
+_BLNK_TRANSFORM+=	opt-sub:-I${_dir_}:-I${_BLNK_MANGLE_DIR.${_dir_}}
 .endfor
 .for _dir_ in ${COMPILER_LIB_DIRS}
 _BLNK_TRANSFORM+=	opt-sub:-L${_dir_}:-L${_BLNK_MANGLE_DIR.${_dir_}}
 .endfor
+#
 # Change any buildlink directories in runtime library search paths into
 # the canonical actual installed paths.
+#
 _BLNK_TRANSFORM+=	rpath:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}:${LOCALBASE}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	rpath:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}:${X11BASE}
 .endif
+#
 # Protect some directories that we allow to be specified for the runtime
 # library search path.
+#
 .for _dir_ in ${_BLNK_PASSTHRU_DIRS} ${_BLNK_PASSTHRU_RPATHDIRS}
 _BLNK_TRANSFORM+=	rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}}
 .endfor
+#
 # Protect /usr/lib/* as they're all allowed to be specified for the
 # runtime library search path.
+#
-_BLNK_TRANSFORM+=	sub-rpath:/usr/lib:${_BLNK_MANGLE_DIR./usr/lib}
+.for _dir_ in ${SYSTEM_DEFAULT_RPATH:ts:}
 _BLNK_TRANSFORM+=	sub-rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir}}
 .endfor
+#
 # Change references to ${DEPOTBASE}/<pkg> into ${LOCALBASE} so that
 # "overwrite" packages think headers and libraries for "pkgviews" packages
 # are just found in the default view.
+#
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _BLNK_TRANSFORM+=	depot:${DEPOTBASE}:${LOCALBASE}
 .endif
+#
 # Convert direct paths to static libraries and libtool archives in
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
+#
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"