From owner-svn-src-stable@freebsd.org Sat Aug 18 16:03:16 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBB0D107047E; Sat, 18 Aug 2018 16:03:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E51D96581; Sat, 18 Aug 2018 16:03:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B0B419B37; Sat, 18 Aug 2018 16:03:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7IG3Gps063861; Sat, 18 Aug 2018 16:03:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7IG3FbF063859; Sat, 18 Aug 2018 16:03:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201808181603.w7IG3FbF063859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 18 Aug 2018 16:03:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r338017 - in stable/11: . share/mk X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/11: . share/mk X-SVN-Commit-Revision: 338017 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2018 16:03:17 -0000 Author: kib Date: Sat Aug 18 16:03:15 2018 New Revision: 338017 URL: https://svnweb.freebsd.org/changeset/base/338017 Log: MFC r336570: Enable OFED build (without extras) by default. For stable/11, this is only done on amd64. Relnotes: yes Sponsored by: Mellanox Technologies Modified: stable/11/UPDATING stable/11/share/mk/src.opts.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/UPDATING ============================================================================== --- stable/11/UPDATING Sat Aug 18 12:17:05 2018 (r338016) +++ stable/11/UPDATING Sat Aug 18 16:03:15 2018 (r338017) @@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20180818: + WITH_OFED option now only enables the build for the OFED libraries + and some fundamental client utilities. OpenSM and rest of the + debugging tools are enabled by WITH_OFED_EXTRA build switch. + WITH_OFED is turned on by default on amd64. + 20180714: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to 6.0.1. Please see the 20141231 entry below for information about Modified: stable/11/share/mk/src.opts.mk ============================================================================== --- stable/11/share/mk/src.opts.mk Sat Aug 18 12:17:05 2018 (r338016) +++ stable/11/share/mk/src.opts.mk Sat Aug 18 16:03:15 2018 (r338017) @@ -196,7 +196,6 @@ __DEFAULT_NO_OPTIONS = \ LOADER_FIREWIRE \ LOADER_FORCE_LE \ NAND \ - OFED \ OFED_EXTRA \ OPENLDAP \ REPRODUCIBLE_BUILD \ @@ -314,6 +313,12 @@ __DEFAULT_YES_OPTIONS+=MLX5TOOL .else __DEFAULT_NO_OPTIONS+=CXGBETOOL __DEFAULT_NO_OPTIONS+=MLX5TOOL +.endif + +.if ${__T} == "amd64" +__DEFAULT_YES_OPTIONS+=OFED +.else +__DEFAULT_NO_OPTIONS+=OFED .endif .include