summaryrefslogtreecommitdiffstats
path: root/share/mk/bsd.files.mk
Commit message (Collapse)AuthorAgeFilesLines
* MFC r309478:bdrewery2017-01-031-2/+2
| | | | DIRDEPS_BUILD: Fix '/' in group names creating a bad cookie.
* MFC r309477:bdrewery2017-01-031-4/+2
| | | | Revert r296585.
* Allow FILESGROUPS to be specified more than once by pruning out duplicatesngie2016-04-301-1/+1
| | | | | MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
* MFHgjb2016-03-141-4/+0
|\ | | | | | | Sponsored by: The FreeBSD Foundation
| * Remove out-of-place make(buildincludes) check.bdrewery2016-03-111-4/+0
| | | | | | | | | | | | | | | | | | This came in r239572 for META_MODE handling but it doesn't make sense since the staging is always done in make(all); make(buildincludes) is never actually ran in the META_MODE build. Reported by: bapt Sponsored by: EMC / Isilon Storage Division
* | MFHgjb2016-03-101-2/+4
|\ \ | |/ | | | | Sponsored by: The FreeBSD Foundation
| * These group names may be used as a cookie, so replace any non-fs-safe ↵bdrewery2016-03-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | characters. One example is in cddl/usr.sbin/dtrace/tests/common/aggs. It could be fixed but other uses of this would break, especially in the DIRDEPS_BUILD which uses the group names for stage cookies. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* | MFHgjb2016-03-021-0/+2
|\ \ | |/ | | | | Sponsored by: The FreeBSD Foundation
| * DIRDEPS_BUILD: Fix some things building in MAKELEVEL0.bdrewery2016-02-261-0/+2
| | | | | | | | | | | | | | For PROGS this was recursing twice since MAKELEVEL0 is for 'dirdeps' which then really builds in a sub-make. Sponsored by: EMC / Isilon Storage Division
* | MFH r289384-r293170gjb2016-01-041-3/+2
|\ \ | |/ | | | | Sponsored by: The FreeBSD Foundation
| * META MODE: Fix FILESNAME not being respected sans other FILES_group overrides.bdrewery2015-10-261-1/+1
| | | | | | | | | | | | This was fixed in bsd.incs.mk in r242801 already. Sponsored by: EMC / Isilon Storage Division
| * META MODE: bsd.files.mk and bsd.confs.mk don't handle symlinks so there is nobdrewery2015-10-261-1/+0
| | | | | | | | | | | | need to set STAGE_SYMLINKS_DIR.${STAGE_SET}. Sponsored by: EMC / Isilon Storage Division
| * Make installing to a non-existent directory an error.bdrewery2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this, if a file was installed to DESTDIR/some/dir and that directory was missing due to not having ran 'make distrib-dirs' yet, the file would be installed as 'some/dir'. For something like bsd.incs.mk with INCLUDEDIR being a sub-directory of /usr/include, this could result in all of the headers being installed to a file rather than getting a directory of them. Now it will error that the file/directory does not exist rather than hide the issue. Another option being discussed is to implement GNU's install -D flag which would auto create any missing directories. This is a mitigation of the problem. The proper order to the build is to run 'make distrib-dirs' first, but that can be forgotten if building from a sub-directory after updating the source code to the latest revision. MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
| * Revert r289282 for now as the interaction with a directory containingbdrewery2015-10-141-3/+0
| | | | | | | | bsd.files.mk and bsd.subdir.mk is recursing too many times.
| * Replace the out-of-place includes/files/config handling in bsd.subdir.mk withbdrewery2015-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | more typical ALL_SUBDIR_TARGETS entries and target hooks in bsd.incs.mk, bsd.files.mk and bsd.confs.mk. This allows the targets to be NOPs if unneeded and still work with the shortcut 'make includes' to build and then install in a parallel-safe manner. Sort and re-indent the ALL_SUBDIR_TARGETS with the new entries. Sponsored by: EMC / Isilon Storage Division
* | Merge from headbapt2015-10-011-2/+4
|\ \ | |/
| * META_MODE: Fix staging not respecting _DIR overrides.bdrewery2015-09-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | This fixes atf-c.h not properly being installed to /usr/include/ (in the stagedir) via its override of 'INCSDIR_atf-c.h= ${INCLUDEDIR}'. This fixes building things that depend on atf. Staging seems to ignore OWN/GRP/MODE settings and needs further exploration. Sponsored by: EMC / Isilon Storage Division
| |
| \
*-. \ Merge from headbapt2015-09-121-0/+3
|\ \ \ | | |/
| | * For each FOO in FILESLISTS, append the value of FOO.yes, sort, andimp2015-08-271-0/+3
| |/ | | | | | | remove duplicates.
* | Merge from headbapt2015-06-151-0/+22
|\ \ | |/
| * Merge head from 7/28sjg2014-08-191-2/+5
| |\
| * \ Merge headsjg2014-04-281-5/+3
| |\ \
| * | | Because the target of SYMLINKS is typically a full path, wesjg2013-01-231-0/+1
| | | | | | | | | | | | | | | | "stage" them to the stage tree rather than a location within.
| * | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.marcel2012-08-221-0/+21
| | | | | | | | | | | | | | | | Requested by: Simon Gerraty <sjg@juniper.net>
* | | | Allow to tag the METALOG per file groupbapt2015-03-051-10/+11
| | | |
* | | | Makes it more flexible to tag and define a target packagebapt2015-02-131-3/+10
| | | |
* | | | Tag the metalog with a global default sets of tags that will be used to decidebapt2015-02-101-3/+3
| |_|/ |/| | | | | | | | what will go in which package, more finer grain tagging to come
* | | Ensure files are created during the build when using bsd.subdir.mk.jmmv2014-06-091-2/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FILES is defined in a Makefile that _also_ includes bsd.subdir.mk, the build of the files (if any) was not properly triggered during the build stage. This was because bsd.files.mk did not define the buildfiles target if it was already defined... and bsd.subdir.mk defined this target on its own, thus causing a conflict. Fix this by unconditionally defining buildfiles from bsd.files.mk; this is safe because nothing else in the tree needs to redefine this and because the target itself contains no commands: all it does is define dependencies. Also ensure that bsd.files.mk is always pulled in by bsd.test.mk regardless of what bsd.prog.mk does. These fixes allow "make installworld" to run cleanly on a system with read-only src and obj trees. This is "make tinderbox" clean. Reviewed by: imp Obtained from: jilles
* | Allow mixing bsd.files.mk with bsd.subdir.mk.rpaulo2013-10-251-5/+3
|/ | | | | | | | | | | | | | | | | | | If a single Makefile wants to recurse into subdirectories and also wants to install files, bsd.files.mk's targets would get ignored in favor of those defined by bsd.subdir.mk because installfiles would not get defined in bsd.files.mk. Prevent this from happening by defining the targets in bsd.files.mk with auxiliary names and listing them as dependencies of installfiles instead. This is required by bsd.test.mk, which needs to install a Kyuafile in pretty much all cases but may also need to recurse into subdirectories for build purposes. Submitted by: Julio Merino jmmv google.com Reviewed by: sjg MFC after: 2 weeks
* Make sure the only thing that follows .endif or .else is a comment.harti2005-04-111-2/+2
|
* Drop support for COPY, -c has been the default mode of install(1)ru2002-07-291-3/+3
| | | | | | for a long time now. Approved by: bde
* Try really hard to fix parallel installs. Add a bunch of .ORDERru2002-07-031-0/+1
| | | | | | | | | | | | | | | | | | | | | directives to ensure that all realinstall sub-tasks are executed after beforeinstall, similarly ensure that all afterinstall sub- tasks are executed after realinstall. Demonstration: all: task1 task2 .ORDER: task1 task2 task2: task2_subtask .ORDER: task1 task2_subtask task1 task2 task2_subtask: @sleep `jot -r 1 0 1.0` @echo ${.TARGET} Without the second .ORDER directive, task2_subtask can be run in parallel with task1. Spotted by: Andrea Campi <andrea@webcom.it>
* Reimplement FILES support using bsd.files.mk with theru2002-06-031-0/+68
same set of features as in recently added bsd.incs.mk (FILESGROUPS, accessibility from both bsd.prog.mk and bsd.lib.mk, de-pessimized typical installation path, etc.) New standard targets: buildfiles, installfiles, and files (buildfiles + installfiles).
OpenPOWER on IntegriCloud