Date: Sat, 23 Apr 2016 07:09:23 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r298503 - in stable/10: kerberos5/lib/libroken share/mk Message-ID: <201604230709.u3N79N4R063031@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Apr 23 07:09:23 2016 New Revision: 298503 URL: https://svnweb.freebsd.org/changeset/base/298503 Log: MFC r297282,r297456,r298012,r298013,r298014: r297282 (by bdrewery): We don't have a CPPFLAGS, COPTS or CPUFLAGS. r297456 (by bdrewery): We don't support DPLIBS. r298012: Add DEBUG_FLAGS to PROG_VARS and STRIP to PROG_OVERRIDE_VARS This will allow the variables [*] to be overridden on a per-PROG basis, which is useful when controlling "stripping" behavior for some tests that require debug symbols or to be unstripped DEBUG_FLAGS (similar to CFLAGS) supports appending, whereas STRIP is an override *: Due to how STRIP is defined in bsd.own.mk (in addition to bsd.lib.mk and bsd.prog.mk), and the fact that bsd.test.mk pulls in bsd.own.mk first, overriding STRIP doesn't work today. A follow up commit is pending to "rectify" this after additional testing is done. Discussed with: bdrewery r298013: Commit documentation change for r298012 Requested by: bdrewery r298014: Regenerate the list of bsd.progs.mk supported variables Prefix with dashes (unordered list) and put one variable on each line (to avoid future conflicts) Done via the following one-liner: > sh -c 'for i in $(make -C tests/sys/aio PROG=foo -VPROG_VARS:O); do printf "\t\t- $i\n"; done' Modified: stable/10/kerberos5/lib/libroken/Makefile stable/10/share/mk/bsd.README stable/10/share/mk/bsd.prog.mk stable/10/share/mk/bsd.progs.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/kerberos5/lib/libroken/Makefile ============================================================================== --- stable/10/kerberos5/lib/libroken/Makefile Sat Apr 23 06:31:46 2016 (r298502) +++ stable/10/kerberos5/lib/libroken/Makefile Sat Apr 23 07:09:23 2016 (r298503) @@ -77,7 +77,6 @@ SRCS= base64.c \ write_pid.c \ xfree.c -CPPFLAGS+= -DBUILD_ROKEN_LIB CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h Modified: stable/10/share/mk/bsd.README ============================================================================== --- stable/10/share/mk/bsd.README Sat Apr 23 06:31:46 2016 (r298502) +++ stable/10/share/mk/bsd.README Sat Apr 23 07:09:23 2016 (r298503) @@ -262,9 +262,26 @@ PROGS_CXX PROG and PROGS_CXX in one Make LDADD.foo= -lutil SRCS.bar= bar_src.c - The supported variables are BINDIR BINGRP BINMODE BINOWN - CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD - LDFLAGS MAN MLINKS PROGNAME SRCS. + The supported variables are: + - BINDIR + - BINGRP + - BINMODE + - BINOWN + - CFLAGS + - CXXFLAGS + - DEBUG_FLAGS + - DPADD + - DPSRCS + - LDADD + - LDFLAGS + - LINKS + - MAN + - MLINKS + - NO_WERROR + - PROGNAME + - SRCS + - STRIP + - WARNS PROGNAME The name that the above program will be installed as, if different from ${PROG}. Modified: stable/10/share/mk/bsd.prog.mk ============================================================================== --- stable/10/share/mk/bsd.prog.mk Sat Apr 23 06:31:46 2016 (r298502) +++ stable/10/share/mk/bsd.prog.mk Sat Apr 23 07:09:23 2016 (r298503) @@ -7,6 +7,7 @@ # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) +.warning COPTS should be CFLAGS. CFLAGS+=${COPTS} .endif Modified: stable/10/share/mk/bsd.progs.mk ============================================================================== --- stable/10/share/mk/bsd.progs.mk Sat Apr 23 06:31:46 2016 (r298502) +++ stable/10/share/mk/bsd.progs.mk Sat Apr 23 07:09:23 2016 (r298503) @@ -34,8 +34,8 @@ UPDATE_DEPENDFILE_PROG?= no .if defined(PROG) # 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 LINKS \ + PROGNAME SRCS STRIP WARNS +PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD 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?201604230709.u3N79N4R063031>