[Midnightbsd-cvs] src [6727] trunk/share/mk/bsd.own.mk: Sync with newer freebsd releases.

[laffer1 at midnightbsd.org]

Revision: 6727
          http://svnweb.midnightbsd.org/src/?rev=6727
Author:   laffer1
Date:     2014-08-29 17:11:32 -0400 (Fri, 29 Aug 2014)
Log Message:
-----------
Sync with newer freebsd releases.

Modified Paths:
--------------
    trunk/share/mk/bsd.own.mk

Modified: trunk/share/mk/bsd.own.mk
===================================================================
--- trunk/share/mk/bsd.own.mk	2014-08-29 21:09:52 UTC (rev 6726)
+++ trunk/share/mk/bsd.own.mk	2014-08-29 21:11:32 UTC (rev 6727)
@@ -44,6 +44,11 @@
 # LIBMODE	Library mode. [${NOBINMODE}]
 #
 #
+# DEBUGDIR	Base path for standalone debug files. [/usr/lib/debug]
+#
+# DEBUGMODE	Mode for debug files. [${NOBINMODE}]
+#
+#
 # KMODDIR	Base path for loadable kernel modules
 #		(see kld(4)). [/boot/kernel]
 #
@@ -148,7 +153,10 @@
 LIBGRP?=	${BINGRP}
 LIBMODE?=	${NOBINMODE}
 
+DEBUGDIR?=	/usr/lib/debug
+DEBUGMODE?=	${NOBINMODE}
 
+
 # Share files
 SHAREDIR?=	/usr/share
 SHAREOWN?=	root
@@ -182,6 +190,15 @@
 
 INCLUDEDIR?=	/usr/include
 
+#
+# install(1) parameters.
+#
+HRDLINK?=	-l h
+SYMLINK?=	-l s
+
+INSTALL_LINK?=		${INSTALL} ${HRDLINK}
+INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
+
 # Common variables
 .if !defined(DEBUG_FLAGS)
 STRIP?=		-s
@@ -204,10 +221,19 @@
 # regardless of user's setting).
 #
 .for var in \
+    CTF \
+    DEBUG_FILES \
     INSTALLLIB \
     MAN \
     PROFILE
 .if defined(NO_${var})
+.if defined(WITH_${var})
+.warning unsetting WITH_${var}
+.undef WITH_${var}
+.if defined(WITH_${var})
+.error wtf
+.endif
+.endif
 WITHOUT_${var}=
 .endif
 .endfor
@@ -223,9 +249,11 @@
     AUDIT \
     AUTHPF \
     BIND \
+    BIND_DNSSEC \
     BIND_ETC \
     BIND_LIBS_LWRES \
     BIND_MTREE \
+    BIND_NAMED \
     BIND_UTILS \
     BLUETOOTH \
     BOOT \
@@ -308,9 +336,11 @@
     AUDIT \
     AUTHPF \
     BIND \
+    BIND_DNSSEC \
     BIND_ETC \
     BIND_LIBS_LWRES \
     BIND_MTREE \
+    BIND_NAMED \
     BIND_UTILS \
     BINUTILS \
     BLUETOOTH \
@@ -343,7 +373,6 @@
     GPIO \
     GROFF \
     HTML \
-    ICONV \
     INET \
     INET6 \
     INFO \
@@ -379,6 +408,7 @@
     OPENSSH \
     OPENSSL \
     PAM \
+    PC_SYSINSTALL \
     PF \
     PMC \
     PPP \
@@ -416,10 +446,14 @@
     BIND_XML \
     CLANG_EXTRAS \
     CLANG_IS_CC \
+    CTF \
+    DEBUG_FILES \
     HESIOD \
+    ICONV \
     IDEA \
-    LIBCPLUSPLUS \
+    NMTREE \
     OFED \
+    OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN \
     SVN
 
@@ -438,9 +472,9 @@
 .endif
 # Clang is only for x86 right now, by default.
 .if ${__T} == "amd64" || ${__T} == "i386"
-__DEFAULT_YES_OPTIONS+=CLANG
+__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL
 .else
-__DEFAULT_NO_OPTIONS+=CLANG
+__DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL
 .endif
 __DEFAULT_NO_OPTIONS+=FDT
 .undef __T
@@ -494,10 +528,12 @@
 .endif
 
 .if ${MK_BIND} == "no"
+MK_BIND_DNSSEC:= no
 MK_BIND_ETC:=	no
 MK_BIND_LIBS:=	no
 MK_BIND_LIBS_LWRES:= no
 MK_BIND_MTREE:=	no
+MK_BIND_NAMED:=	no
 MK_BIND_UTILS:=	no
 .endif
 
@@ -512,12 +548,9 @@
 
 .if ${MK_CDDL} == "no"
 MK_ZFS:=	no
+MK_CTF:=	no
 .endif
 
-.if ${MK_CLANG} == "no"
-MK_CLANG_EXTRAS:= no
-.endif
-
 .if ${MK_CRYPT} == "no"
 MK_OPENSSL:=	no
 MK_OPENSSH:=	no
@@ -564,13 +597,11 @@
 .endif
 
 .if ${MK_CLANG} == "no"
+MK_CLANG_EXTRAS:= no
+MK_CLANG_FULL:= no
 MK_CLANG_IS_CC:= no
 .endif
 
-MK_LIBCPLUSPLUS?= no
-
-MK_LIBCPLUSPLUS?= no
-
 #
 # Set defaults for the MK_*_SUPPORT variables.
 #
@@ -624,6 +655,41 @@
 .endif
 .endfor
 
+#
+# MK_* options that default to "yes" if the compiler is a C++11 compiler.
+#
+.include <bsd.compiler.mk>
+.for var in \
+    LIBCPLUSPLUS
+.if defined(WITH_${var}) && defined(WITHOUT_${var})
+.error WITH_${var} and WITHOUT_${var} can't both be set.
+.endif
+.if defined(MK_${var})
+.error MK_${var} can't be set by a user.
+.endif
+.if ${COMPILER_FEATURES:Mc++11}
+.if defined(WITHOUT_${var})
+MK_${var}:=	no
+.else
+MK_${var}:=	yes
+.endif
+.else
+.if defined(WITH_${var})
+MK_${var}:=	yes
+.else
+MK_${var}:=	no
+.endif
+.endif
+.endfor
+
+.if ${MK_CTF} != "no"
+CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.elif defined(.PARSEDIR) || ${MAKE_VERSION} >= 9201210220
+CTFCONVERT_CMD=
+.else
+CTFCONVERT_CMD=	@:
+.endif 
+
 .endif # !_WITHOUT_SRCCONF
 
 .endif	# !target(__<bsd.own.mk>__)