svn merge svn+ssh://svn.freebsd.org/base/head@208996

4 files changed, 37 insertions, 8 deletions

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 2c8a8cd..51cfb39 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -91,12 +91,12 @@ the command "make b" will echo "bar".  This is for compatibility with the
 way the V7 make behaved.
 
 It's fairly difficult to make the BSD .mk files work when you're building
-multiple programs in a single directory.  It's a lot easier split up the
-programs than to deal with the problem.  Most of the agony comes from making
-the "obj" directory stuff work right, not because we switch to a new version
-of make.  So, don't get mad at us, figure out a better way to handle multiple
-architectures so we can quit using the symbolic link stuff.  (Imake doesn't
-count.)
+multiple programs in a single directory.  It's a lot easier to split up
+the programs than to deal with the problem.  Most of the agony comes from
+making the "obj" directory stuff work right, not because we switch to a new
+version of make.  So, don't get mad at us, figure out a better way to handle
+multiple architectures so we can quit using the symbolic link stuff.
+(Imake doesn't count.)
 
 The file .depend in the source directory is expected to contain dependencies
 for the source files.  This file is read automatically by make after reading
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 2ef272c..5068707 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -9,7 +9,7 @@ _CPUCFLAGS =
 . if ${MACHINE_CPUARCH} == "i386"
 MACHINE_CPU = i486
 . elif ${MACHINE_CPUARCH} == "amd64"
-MACHINE_CPU = amd64 sse2 sse
+MACHINE_CPU = amd64 sse2 sse mmx
 . elif ${MACHINE_CPUARCH} == "ia64"
 MACHINE_CPU = itanium
 . elif ${MACHINE_CPUARCH} == "powerpc"
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index c80fe23..3e47a2c 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -82,6 +82,7 @@ LIBLN?=		"don't use LIBLN, use LIBL"
 .if ${MK_BIND} != "no"
 LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
 .endif
+LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
@@ -128,6 +129,7 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
+LIBPKG?=	${DESTDIR}${LIBDIR}/libpkg.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 777ff36..8839bb4 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -278,6 +278,27 @@ WITH_HESIOD=
 WITH_IDEA=
 .endif
 
+# Enable FDT by default for selected platforms.
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
+# XXX this is temporarily disabled until all FDT support code is in place.
+#_fdt=	FDT
+_no_fdt= FDT
+.else
+_no_fdt= FDT
+.endif
+
+#
+# Default behaviour of MK_CLANG depends on the architecture.
+#
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "powerpc"
+_clang_yes=CLANG
+_clang_no=
+.else
+_clang_yes=
+_clang_no=CLANG
+.endif
+
 #
 # MK_* options which default to "yes".
 #
@@ -305,6 +326,7 @@ WITH_IDEA=
     BZIP2 \
     CALENDAR \
     CDDL \
+    ${_clang_yes} \
     CPP \
     CRYPT \
     CTM \
@@ -313,6 +335,7 @@ WITH_IDEA=
     DICT \
     DYNAMICROOT \
     EXAMPLES \
+    ${_fdt} \
     FLOPPY \
     FORTH \
     FP_LIBC \
@@ -407,6 +430,8 @@ MK_${var}:=	yes
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
+    ${_clang_no} \
+    ${_no_fdt} \
     HESIOD \
     IDEA
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
@@ -486,6 +511,7 @@ MK_GROFF:=	no
 .endif
 
 .if ${MK_TOOLCHAIN} == "no"
+MK_CLANG:=	no
 MK_GDB:=	no
 .endif
 
@@ -524,7 +550,8 @@ MK_${var}_SUPPORT:= yes
 # MK_* options whose default value depends on another option.
 #
 .for vv in \
-    GSSAPI/KERBEROS
+    GSSAPI/KERBEROS \
+    MAN_UTILS/MAN
 .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
 .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
 .endif