From owner-svn-ports-head@freebsd.org Thu Nov 21 22:22:05 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65E9D1CC78F; Thu, 21 Nov 2019 22:22:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47JvDs263Rz427F; Thu, 21 Nov 2019 22:22:05 +0000 (UTC) (envelope-from jhb@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 2C7B61A194; Thu, 21 Nov 2019 22:22:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xALMM5Q3040271; Thu, 21 Nov 2019 22:22:05 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xALMM54C040270; Thu, 21 Nov 2019 22:22:05 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201911212222.xALMM54C040270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 21 Nov 2019 22:22:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518116 - head/devel/mdb X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/devel/mdb X-SVN-Commit-Revision: 518116 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2019 22:22:05 -0000 Author: jhb (src,doc committer) Date: Thu Nov 21 22:22:04 2019 New Revision: 518116 URL: https://svnweb.freebsd.org/changeset/ports/518116 Log: Use clang 7 as compiler on 11.x and 12.x to fix build. clang 8 and later error for duplicate definitions of enum values. mdb depends on having identical but duplicate definitions. This was fixed differently in 13 with a change to the kernel, but that change is disruptive and cannot be easily backported. Reported by: pkg-fallout, Attila Nagy Approved by: bdrewery MFH: 2019Q3 Differential Revision: https://reviews.freebsd.org/D22486 Modified: head/devel/mdb/Makefile Modified: head/devel/mdb/Makefile ============================================================================== --- head/devel/mdb/Makefile Thu Nov 21 21:51:33 2019 (r518115) +++ head/devel/mdb/Makefile Thu Nov 21 22:22:04 2019 (r518116) @@ -9,7 +9,7 @@ COMMENT= Solaris Modular Debugger LICENSE= CDDL -USES= uidfix +USES= compiler uidfix USE_GITHUB= yes GH_ACCOUNT= bsdjhb @@ -29,6 +29,15 @@ CFLAGS+= -DMDB_PREFIX=\\\"${PREFIX}\\\" -g .if !exists(${SRC_BASE}/cddl/compat) || !exists(${SRC_BASE}/sys/cddl/compat) IGNORE= requires full source tree with CDDL sources +.endif + +.if ${OSVERSION} < 1300015 && ${COMPILER_TYPE} == "clang" && \ + ${COMPILER_VERSION} >= 80 +# clang 8 cannot compile due to enum redefinitions in kernel.h +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang70:devel/llvm70 +CPP= ${LOCALBASE}/bin/clang-cpp70 +CC= ${LOCALBASE}/bin/clang70 +CXX= ${LOCALBASE}/bin/clang++70 .endif pre-install: