diff options
| author | gjb <gjb@FreeBSD.org> | 2018-04-20 00:02:47 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2018-04-20 00:02:47 +0000 |
| commit | 94c28bf78654f162c5208e948a30ab3309be8016 (patch) | |
| tree | df03d6d80e8dc4f638e4b70b738c6d77300be404 | |
| parent | 2866cad5c87cf3e2add99d84925a7ee2c21e8224 (diff) | |
| download | FreeBSD-src-94c28bf78654f162c5208e948a30ab3309be8016.zip FreeBSD-src-94c28bf78654f162c5208e948a30ab3309be8016.tar.gz | |
Update stable/11 from 11.1-STABLE to 11.2-PRERELEASE, marking the
official start of the code slush.
Set the default mdoc(7) version to 11.2, and update the clang(1)
TARGET_TRIPLE to reflect 11.2. While here, add missing FreeBSD
major versions to mdoc(7).
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/tmac/mdoc.local.in | 4 | ||||
| -rw-r--r-- | lib/clang/llvm.build.mk | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6192eb3..08aa2af 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -603,7 +603,7 @@ XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ .endif .else TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.1 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.2 XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} diff --git a/gnu/usr.bin/groff/tmac/mdoc.local.in b/gnu/usr.bin/groff/tmac/mdoc.local.in index af9efa1..019ab21 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local.in +++ b/gnu/usr.bin/groff/tmac/mdoc.local.in @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~11.1 +.ds doc-default-operating-system FreeBSD\~11.2 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-2.2.9 2.2.9 @@ -64,8 +64,10 @@ .ds doc-operating-system-FreeBSD-10.1 10.1 .ds doc-operating-system-FreeBSD-10.2 10.2 .ds doc-operating-system-FreeBSD-10.3 10.3 +.ds doc-operating-system-FreeBSD-10.4 10.4 .ds doc-operating-system-FreeBSD-11.0 11.0 .ds doc-operating-system-FreeBSD-11.1 11.1 +.ds doc-operating-system-FreeBSD-11.2 11.2 . .\" Definitions for other *BSDs not (yet) in doc-common .ds doc-operating-system-NetBSD-7.0 7.0 diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index f5838cf..1d67e5f 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -31,7 +31,7 @@ TARGET_ABI= -gnueabi TARGET_ABI= .endif VENDOR= unknown -OS_VERSION= freebsd11.1 +OS_VERSION= freebsd11.2 TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION} diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4bc0096..5c70fec 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -43,8 +43,8 @@ # included if the tree is modified. TYPE="FreeBSD" -REVISION="11.1" -BRANCH="STABLE" +REVISION="11.2" +BRANCH="PRERELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
