Date: Sun, 27 Aug 2017 09:57:36 -0700 From: Conrad Meyer <cem@freebsd.org> To: svn-src-all@freebsd.org Cc: src-committers <src-committers@freebsd.org>, svn-src-head@freebsd.org Subject: Re: svn commit: r322952 - head/share/mk Message-ID: <CAG6CVpX0jfq7M8gotcpkU%2BOxLuXUENDrVFe6qOOq1e7R%2Bo6AqQ@mail.gmail.com> In-Reply-To: <201708271646.v7RGkpLc046182@repo.freebsd.org> References: <201708271646.v7RGkpLc046182@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <ngie@freebsd.org> 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 <bsd.libnames.mk>
>
> +.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 <bsd.nls.mk>
> +.if defined(_COV_FLAG)
> +COV_OBJS= ${OBJS}
> +COV_SRCS= ${SRCS:M*.[c|cc|cpp|cxx|C]}
> +.include <bsd.cov.mk>
> +.endif
> .include <bsd.files.mk>
> .include <bsd.incs.mk>
> .include <bsd.confs.mk>
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpX0jfq7M8gotcpkU%2BOxLuXUENDrVFe6qOOq1e7R%2Bo6AqQ>