From owner-svn-src-all@freebsd.org Sun Aug 27 16:57:45 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65C37DF378B; Sun, 27 Aug 2017 16:57:45 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi0-f41.google.com (mail-oi0-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 340C077125; Sun, 27 Aug 2017 16:57:44 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi0-f41.google.com with SMTP id g127so15787151oic.1; Sun, 27 Aug 2017 09:57:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=0u/zVFuu9U7l1xEGsJlTQJG80nTDCqAAnqIJF+koTHs=; b=q9gCf0zJUSjtFu9usPa4pYgEQEpAnqkl9C38/xMUtLlTxjcdeuQbFsLjR+KNe18GKR CyXHlzjeBAe1lGiXl3Eh6n4WriVGDVg1pFVIkn+AombRdnR/8NfSAb33FkGj9VlR5TiR CspfDwx4bdYSn8ToDkaRG2C3J66Drx/vJsPeBrITDtFbvKgjZSQAgpT5ZnS7irOb6Lon t97BlaEsCOfc4LslXTJwrTdlCyHt3BB9uVmtvOgBkBp+gN15U1hCxaNBOVs+8hC1O11+ VHgFjmgXYQFfRu4nhcRQYpByw5mrCHtxd2cHCKN0fEO+1sTiBOJuv56/jIgjE64a8Fnc y+AA== X-Gm-Message-State: AHYfb5j3TSuTmqXoMcWcMLZGv6CXBktokbkzCR5Cr/eo5P7Qf0+Cx9P5 lNehh2fb+wpv5ZuZrEc= X-Received: by 10.202.105.198 with SMTP id e189mr5370896oic.197.1503853057601; Sun, 27 Aug 2017 09:57:37 -0700 (PDT) Received: from mail-io0-f174.google.com (mail-io0-f174.google.com. [209.85.223.174]) by smtp.gmail.com with ESMTPSA id e204sm11749301oia.45.2017.08.27.09.57.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Aug 2017 09:57:37 -0700 (PDT) Received: by mail-io0-f174.google.com with SMTP id c18so10170725ioj.1; Sun, 27 Aug 2017 09:57:37 -0700 (PDT) X-Received: by 10.107.38.206 with SMTP id m197mr4657775iom.157.1503853057055; Sun, 27 Aug 2017 09:57:37 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.81.131 with HTTP; Sun, 27 Aug 2017 09:57:36 -0700 (PDT) In-Reply-To: <201708271646.v7RGkpLc046182@repo.freebsd.org> References: <201708271646.v7RGkpLc046182@repo.freebsd.org> From: Conrad Meyer Date: Sun, 27 Aug 2017 09:57:36 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r322952 - head/share/mk To: svn-src-all@freebsd.org Cc: src-committers , svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Aug 2017 16:57:45 -0000 This appears to be breaking the build: -------------------------------------------------------------- >>> stage 1.1: legacy release compatibility shims -------------------------------------------------------------- ===> tools/build (obj,includes,all,install) make[5]: "/home/cem/head.svn/share/mk/bsd.lib.mk" line 79: Malformed conditional (${MK_COVERAGE} != "no" && (!empty(CFLAGS:M-g*) || !empty(CXXFLAGS:M-g*))) make[5]: Fatal errors encountered -- cannot continue make[5]: stopped in /home/cem/head.svn/tools/build On Sun, Aug 27, 2017 at 9:46 AM, Ngie Cooper wrote: > Author: ngie > Date: Sun Aug 27 16:46:51 2017 > New Revision: 322952 > URL: https://svnweb.freebsd.org/changeset/base/322952 > > Log: > Try and rebase the bsd.lib.mk changes after ^/head@r322824 was merged in > > Unfortunately the snippet's now broken -- need to get the matching expressions to > work properly. > > Modified: > head/share/mk/bsd.lib.mk > > Modified: head/share/mk/bsd.lib.mk > ============================================================================== > --- head/share/mk/bsd.lib.mk Sun Aug 27 16:15:37 2017 (r322951) > +++ head/share/mk/bsd.lib.mk Sun Aug 27 16:46:51 2017 (r322952) > @@ -76,6 +76,13 @@ CTFFLAGS+= -g > > .include > > +.if ${MK_COVERAGE} != "no" && (!empty(CFLAGS:M-g*) || !empty(CXXFLAGS:M-g*)) > +_COV_FLAG= --coverage > +CFLAGS+= ${_COV_FLAG} > +CXXFLAGS+= ${_COV_FLAG} > +.error "foo" > +.endif > + > # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries > # .pico used for PIC object files > .SUFFIXES: .out .o .bc .ll .po .pico .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln > @@ -95,14 +102,14 @@ PO_FLAG=-pg > ${CTFCONVERT_CMD} > > .c.pico: > - ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CC} ${PICFLAG} -DPIC ${PO_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} > ${CTFCONVERT_CMD} > > .cc.po .C.po .cpp.po .cxx.po: > ${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} > > .cc.pico .C.pico .cpp.pico .cxx.pico: > - ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CXX} ${PICFLAG} -DPIC ${PO_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} > > .f.po: > ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} > @@ -142,6 +149,12 @@ _SHLIBDIR:=${SHLIBDIR} > .if defined(SHLIB_NAME) > .if ${MK_DEBUG_FILES} != "no" > SHLIB_NAME_FULL=${SHLIB_NAME}.full > +.if ${MK_COVERAGE} != "no" > +COVERAGEFILEDIR=${COVERAGEDIR}${_SHLIBDIR} > +.if !exists(${DESTDIR}${COVERAGEFILEDIR}) > +COVERAGEMKDIR= > +.endif > +.endif > # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory > .if ${_SHLIBDIR} == "/boot" ||\ > ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ > @@ -221,6 +234,9 @@ CLEANFILES+= ${SOBJS} > .if defined(SHLIB_NAME) > _LIBS+= ${SHLIB_NAME} > > +.if !empty(_COV_FLAG) > +SOLINKOPTS+= ${_COV_FLAG} > +.endif > SOLINKOPTS+= -shared -Wl,-x > .if defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no" > SOLINKOPTS+= -Wl,--no-fatal-warnings > @@ -360,6 +376,14 @@ _libinstall: > ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ > ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ > .if ${MK_DEBUG_FILES} != "no" > +.if ${MK_COVERAGE} != "no" > +.if defined(COVERAGEMKDIR) > + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${COVERAGEFILEDIR}/ > +.endif > + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ > + ${_INSTALLFLAGS} \ > + ${SHLIB_NAME}.full ${DESTDIR}${COVERAGEFILEDIR}/${SHLIB_NAME} > +.endif > .if defined(DEBUGMKDIR) > ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/ > .endif > @@ -411,6 +435,11 @@ _libinstall: > > .if !defined(LIBRARIES_ONLY) > .include > +.if defined(_COV_FLAG) > +COV_OBJS= ${OBJS} > +COV_SRCS= ${SRCS:M*.[c|cc|cpp|cxx|C]} > +.include > +.endif > .include > .include > .include >