Date: Sat, 26 Mar 2016 03:46:04 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297282 - in head: kerberos5/lib/libroken share/mk Message-ID: <201603260346.u2Q3k49U019864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Mar 26 03:46:04 2016 New Revision: 297282 URL: https://svnweb.freebsd.org/changeset/base/297282 Log: We don't have a CPPFLAGS, COPTS or CPUFLAGS. Sponsored by: EMC / Isilon Storage Division Modified: head/kerberos5/lib/libroken/Makefile head/share/mk/bsd.README head/share/mk/bsd.clang-analyze.mk head/share/mk/bsd.prog.mk head/share/mk/bsd.progs.mk Modified: head/kerberos5/lib/libroken/Makefile ============================================================================== --- head/kerberos5/lib/libroken/Makefile Fri Mar 25 22:36:32 2016 (r297281) +++ head/kerberos5/lib/libroken/Makefile Sat Mar 26 03:46:04 2016 (r297282) @@ -76,7 +76,6 @@ SRCS= base64.c \ write_pid.c \ xfree.c -CPPFLAGS+= -DBUILD_ROKEN_LIB CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h Modified: head/share/mk/bsd.README ============================================================================== --- head/share/mk/bsd.README Fri Mar 25 22:36:32 2016 (r297281) +++ head/share/mk/bsd.README Sat Mar 26 03:46:04 2016 (r297282) @@ -309,7 +309,7 @@ PROGS_CXX PROG and PROGS_CXX in one Make SRCS.bar= bar_src.c The supported variables are BINDIR BINGRP BINMODE BINOWN - CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD + CFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD LDFLAGS LIBADD MAN MLINKS PROGNAME SRCS. PROGNAME The name that the above program will be installed as, if Modified: head/share/mk/bsd.clang-analyze.mk ============================================================================== --- head/share/mk/bsd.clang-analyze.mk Fri Mar 25 22:36:32 2016 (r297281) +++ head/share/mk/bsd.clang-analyze.mk Sat Mar 26 03:46:04 2016 (r297282) @@ -58,14 +58,12 @@ CLANG_ANALYZE_CXXFLAGS= ${CXXFLAGS:N-Wa, .c.clang-analyzer: ${CC:N${CCACHE_BIN}} ${CLANG_ANALYZE_FLAGS} \ - ${CLANG_ANALYZE_CFLAGS} ${CPPFLAGS} \ - ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ - ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} + ${CLANG_ANALYZE_CFLAGS} \ + ${.IMPSRC} .cc.clang-analyzer .cpp.clang-analyzer .cxx.clang-analyzer .C.clang-analyzer: ${CXX:N${CCACHE_BIN}} ${CLANG_ANALYZE_CXX_FLAGS} \ - ${CLANG_ANALYZE_CXXFLAGS} ${CPPFLAGS} \ - ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ - ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} + ${CLANG_ANALYZE_CXXFLAGS} \ + ${.IMPSRC} CLANG_ANALYZE_SRCS= \ ${SRCS:M*.[cC]} ${SRCS:M*.cc} \ Modified: head/share/mk/bsd.prog.mk ============================================================================== --- head/share/mk/bsd.prog.mk Fri Mar 25 22:36:32 2016 (r297281) +++ head/share/mk/bsd.prog.mk Sat Mar 26 03:46:04 2016 (r297282) @@ -8,6 +8,7 @@ # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) +.warning COPTS should be CFLAGS. CFLAGS+=${COPTS} .endif Modified: head/share/mk/bsd.progs.mk ============================================================================== --- head/share/mk/bsd.progs.mk Fri Mar 25 22:36:32 2016 (r297281) +++ head/share/mk/bsd.progs.mk Sat Mar 26 03:46:04 2016 (r297282) @@ -24,7 +24,7 @@ PROGS += ${PROGS_CXX} # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ PROGNAME SRCS WARNS -PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \ +PROG_VARS += CFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \ LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603260346.u2Q3k49U019864>