Merge from head

This commit is contained in:
Simon J. Gerraty
2014-05-08 23:54:15 +00:00
696 changed files with 44610 additions and 5401 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
# @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= lib ${_tests} usr.bin
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
GCCDIR= ${.CURDIR}/../../../contrib/gcc
+1 -1
View File
@@ -6,7 +6,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
SHLIB_NAME= libgcc_s.so.1
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
#
# libgcc is linked in last and thus cannot depend on ssp symbols coming
# from earlier libraries. Disable stack protection for this library.
+1 -1
View File
@@ -3,7 +3,7 @@
MK_PROFILE= no
MK_SSP= no
.include <bsd.own.mk>
.include <src.opts.mk>
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
GCCDIR= ${.CURDIR}/../../../contrib/gcc
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_binutils} \
${_cc} \
+1 -1
View File
@@ -4,7 +4,7 @@
# BINDIR
.include "${.CURDIR}/../../Makefile.inc"
.include "${.CURDIR}/../Makefile.inc0"
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
+1 -1
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
.include "../Makefile.inc0"
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${SRCDIR}/ld
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
# The order of some of these are rather important. Some depend on previous
# subdirs.
+1
View File
@@ -1,5 +1,6 @@
# $FreeBSD$
.include <src.opts.mk>
.include "../Makefile.inc"
# Sometimes this is .include'd several times...
+1 -1
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
+1 -1
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
+1 -1
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
CFLAGS+= -I.
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
+1 -1
View File
@@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR} -I${DIALOG}
WARNS?= 6
.include <bsd.own.mk>
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
+1 -1
View File
@@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GREP_LIBZ=YES