summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develdevelRenato Botelho2017-02-231-2/+19
|\
| * MFC r285119,r292502,r295380:ngie2017-02-161-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r285119 (by jmmv): Add support for TEST_METADATA Allow Makefiles to define generic metadata settings that apply to all test programs defined by a Makefile. The generic TEST_METADATA variable extends the per-test program settings already supported via TEST_METADATA.<program>. This feature will be useful to easily apply some settings to all programs in a directory. In particular, Kyua 0.12 will support parallel execution of test programs and a bunch of them will need to be tagged as is_exclusive to indicate that they cannot be run in parallel with anything else due to their side-effects. It will be reasonable to set this setting on whole directories. r292502: Always expose LOCALBASE, not just when CROSS_TOOLCHAIN is defined Instead of using which(1) to look for doxygen, look for it in <LOCALBASE>/bin . $PATH gets mangled by make buildenv, etc so it's better to just be explicit about the path if someone uses that for instance. r295380: Simplify running the FreeBSD test suite Replace `make regress` (legacy test make target) and `make test` (incomplete test make target added with the FreeBSD test suite) with make check as it's consistent with other open source projects. `make check` defaults to running tests from `.OBJDIR`, but can be overridden with the `CHECKDIR` variable. Add `make checkworld` target to simplify running the FreeBSD test suite from `TESTSBASE` (i.e. the top-level tests directory), similar to buildworld. Document `make check` and `make checkworld` in build(7). Other minor changes: - Rename intermediate file (`Kyuafile.auto`) to `Kyuafile` to simplify `make check`. - Remove terse warnings attached to `beforetest`/`aftertest`. - Add kyua binary check to check target in suite.test.mk; error out if it's not found The MFC is [partly] contingent on other build related changes being MFCed. X-MFC to: stable/10 Relnotes: yes
| * MFC r286536:ngie2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | This unbreaks "make installworld" for me on ^/stable/10 r286536 (by imp): cmp and cp are used by the kerberos install, so need to be imclided in ITOOLS. They are tiny enough that I'm not making conditional: the minuscule savings in disk space isn't worth the obfuscation of Makefile.inc1.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2017-02-091-1/+1
|\ \ | |/
| * MFC r311140:ngie2017-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI and MK_KERBEROS_SUPPORT != no This fixes the odd case where someone specified MK_GSSAPI=no and MK_KERBEROS_SUPPORT=yes (which admittedly, probably doesn't make sense, but the build system doesn't prevent this case today, and it didn't when I filed the bug back in 2011 either). PR: 159745
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-12-141-0/+10
|\ \ | |/
| * MFC r309332:dim2016-12-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | Cleanup old debug dirs in delete-old-dirs target Any .debug or .symbols files under /usr/lib/debug which correspond to OLD_FILES entries in ObsoleteFiles.inc are also automatically cleaned up by the delete-old target. Make this also apply to any OLD_DIRS entries. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D8683
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-09-201-1/+1
|\ \ | |/
| * MFC r303935lwhsu2016-09-131-1/+1
| | | | | | | | | | | | | | | | Only remove empty directories before packaging. This preserves files are intentionally empty, most of them are in tests.txz Reviewed by: bdrewery
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-091-4/+4
|\ \ | |/
| * Merge r299077, which provides ability to override NO_INSTALLEXTRAKERNELS.glebius2016-05-041-4/+4
| | | | | | | | | | | | | | | | | | | | Override NO_INSTALLEXTRAKERNELS for the release build. Historically, in the stable/10 branch the regular 'installkernel' target DID NOT install extra kernels, while the release build DID. This change finally restores POLA, I hope. Reported by: Fedor <f att.org.ru> Reviewed by: gjb
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-04-251-0/+7
|\ \ | |/
| * Fix compiled-in keymap generation for sc/vt consolesemaste2016-04-211-0/+7
| | | | | | | | | | | | | | | | | | In r298297 kbdcontrol's -P <path> option was MFC'd to stable/10, which enables this change for a simplified compile-time default keymap build process. PR: 193865 MFC of: r296899, r296914, r297363, r298402
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-251-1/+1
|\ \ | |/
| * Make it possible to override NO_INSTALLEXTRAKERNELS.glebius2016-01-221-1/+1
| | | | | | | | Submitted by: ngie
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-131-22/+33
|\ \ | |/
| * MFC r293440:bdrewery2016-01-111-7/+4
| | | | | | | | Fix upgrading from OSVERSION 1000002-1000032 after r288829.
| * Merge r293282 from head:glebius2016-01-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | Provide knob NO_INSTALLEXTRAKERNELS. If defined, extra kernels in KERNCONF won't be installed, only the first one would. Turn NO_INSTALLEXTRAKERNELS=yes on stable/10 to preserve original behaviour of not installing additional kernels built. Reported & tested by: Trond Endrestøl <Trond.Endrestol fagskolen.gjovik.no> Reported & tested by: dhw
| * MFC r291611:bdrewery2016-01-071-3/+15
| | | | | | | | | | | | Add NO_INSTALLKERNEL to undo the assumption that the first KERNCONF will be installed as "kernel". This is relevant for packaging of the kernel when not wanting a default "kernel.txz".
| * MFC r291610:bdrewery2016-01-071-8/+9
| | | | | | | | | | Allow storing package(world|kernel) tarballs into a different location at PACKAGEDIR.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-071-3/+19
|\ \ | |/
| * Merge from head r287357-287358,287400:glebius2016-01-051-3/+19
| | | | | | | | | | Not only build with buildworld, but also install with installworld all alternative kernels.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-301-15/+17
|\ \ | |/
| * MFC r278449, r278926:gjb2015-12-301-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | r278449: Enable multi-threaded xz(1) compression for release install media. r278926 (rpaulo): Use xz(1) via pipe when compressing the release distribution tarballs. Tested on: stable/10@r292855 Sponsored by: The FreeBSD Foundation
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-221-0/+2
|\ \ | |/
| * MFC: xz 5.2.2.delphij2015-12-221-0/+2
| | | | | | | | Relnotes: yes
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-171-7/+1
|\ \ | |/
| * MFC r282821: Remove redundant csu subdir logicemaste2015-12-161-7/+1
| | | | | | | | | | | | | | The appropriate subdirectories are handled by lib/csu/Makefile. There's no need to duplicate this logic in Makefile.inc1 and lib/Makefile. Sponsored by: The FreeBSD Foundation
* | Partially revert e400455deb0c5717b85fd4747795cd7749fbd953Renato Botelho2015-12-101-3/+0
| | | | | | | | | | | | | | Remove libmd from bootstrap_tools as done in r291026 TAG: IPSEC-HEAD Issue: #4841
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-101-97/+97
|\ \ | |/
| * MFC r291605:bdrewery2015-12-081-48/+48
| | | | | | | | | | Fix errors being ignored in many phases of the build since the bmake integration.
| * MFC r291026:bdrewery2015-12-041-1/+0
| | | | | | | | Remove unneeded libmd from bootstrap-tools (reverting r246784).
| * MFC r290812:bdrewery2015-12-041-2/+2
| | | | | | | | Avoid setting schg in the objtree for lib32 build.
| * MFC r289360,r289361,r289378,r289430,r289605,r289676:bdrewery2015-12-041-49/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r289360: Add temporary workaround for .MAKE being applied to _worldtmp, since r251750. r289361: Consider top-level targets to be .PHONY as bmake won't build them otherwise if a file with the same name is found in the directory. r289378: Mark sub-make targets as .MAKE and .PHONY to handle -n and always-build properly. r289430: Remove .MAKE from targets that do more than just run sub-makes, such as calling rm or mtree. r289605: Add missing .PHONY for parallel subdir target. r289676: Add some missing '+', .MAKE, and .PHONY modifiers.
* | Merge branch 'stable/10' into develRenato Botelho2015-11-031-1/+13
|\ \ | |/
| * MFC r289407:bdrewery2015-10-261-0/+12
| | | | | | | | Fix delete-old and check-old-files not removing old debug symbols.
| * MFC r288339: remove unused sgsmsg utility (originally imported from opensolaris)avg2015-10-231-1/+1
| |
* | MFC r282736:Luiz Otavio O Souza2015-10-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbreak build following rev. 282726 (Makefile.inc1): add dependency of xinstall on libmd to avoid failure of parallel bootstrap. (lib/libmd/*.h): do not redefine symbols if already defined as macros (libcrypt uses the same sources internally, redefining symbols with a prefix of its own). Fixes build failures caused by previous change to libmd. Reported by: ian Pointy hat to: thomas TAG: IPSEC-HEAD Issue: #4841
* | Merge branch 'stable/10' into develRenato Botelho2015-10-131-0/+2
|\ \ | |/
| * MFC 288829ian2015-10-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The latest version of lex requires the latest m4 to build, add a dependency when running the build-tools stage. The requirement is due to the -P flag used when running m4 from usr.bin/lex Makefile to generate skel.c. With the old m4 that fails and the failure is ignored, resulting in an empty(-ish) skel.c, which leads to later build failures when the misconfigured new lex tool is run. This enables building -current (and 10-stable after MFC) on a stable-8 system again.
* | Importing pfSense patch patch_review_D2626.diffRenato Botelho2015-08-171-3/+0
|/
* MFC r262670 (marcel):gjb2015-08-131-2/+2
| | | | | | | | | Use ${MAKE} so that we always use the same version/implementation of make(1). PR: 202277 Submitted by: John Hein Sponsored by: The FreeBSD Foundation
* Direct commitimp2015-08-121-1/+5
| | | | | | | | | When compiling on -current from r284356 to r285986, the host's crunchgen can't be used because builds of rescue break when STRIP= was used to prevent stripping of binaries. Direct commit because -current code is different. Building 10 on current is common enough to warrnat a safety belt since this has been broken for two months. The offending change was never in stable/10.
* MFC r281618,r281823:ngie2015-05-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | r281618: Defeat race with MK_KERBEROS == yes introduced with bootstrap-tools parallelization work done in r279197 - kerberos5/lib/libroken requires kerberos5/tools/make-roken to build - kerberos5/tools/asn1_compile, kerberos5/tools/slc, and usr.bin/compile_et require kerberos5/lib/libroken and kerberos5/lib/libvers This race is incredibly evident when cross-building sparc64 on ref10-amd64.freebsd.org Pointyhat to: ngie r281823: Serialize all of _kerberos5_bootstrap_tools to avoid build failures involving make bootstrap-tools On the plus side, this also greatly reduces complexity Pointyhat to: ngie Reported by: Willem Jan Withagen <wjw@digiware.nl>
* MFC r270155, r274490, r274593, r274607garga2015-04-211-0/+88
| | | | | | | | | Add native-xtools target to stable/10 Differential Revision: https://reviews.freebsd.org/D2044 Reviewed by: sbruno@ Approved by: sbruno@ Sponsored by: Netgate
* MFC r272814 (by bapt):dim2015-04-101-2/+3
| | | | | | | | | | | Add OBJCOPY to the list of external tools MFC r272815 (by bapt): Fix typo This should fix the build troubles some people have been seeing after the MFC of r280980 (in r281289). Sorry for the breakage.
* MFC r280980:dim2015-04-091-3/+5
| | | | | | | | Ensure the cross assembler, linker and objcopy are used for the build32 stage, just like for the regular world stage. Reviewed by: rodrigc, imp, bapt, emaste Differential Revision: https://reviews.freebsd.org/D2187
* Ensure yacc is built during bootstrap-tools for __FreeBSD_versiondim2015-04-051-1/+1
| | | | | | 1001506 and earlier, since some of the ACPI tools now reach yacc's old maximum table limit. This should fix the Jenkins buildbot, which apparently runs 10.1-RELEASE.
* MFC r280179,r280180:bdrewery2015-04-041-0/+10
| | | | | | | | | | | | r280179: Add LIB_CXX so that C++ libraries will use CXX to link. This adds some extra dependencies directly to Makefile.inc1 as atf is still a prebuild library in stable/10. If r273449 is MFCd these can come out. r280180: Document LIB and LIB_CXX.
* Defeat race with texinfo tools built with make bootstrap-toolsngie2015-03-221-0/+3
| | | | | This is a direct commit to stable/10 because texinfo has been removed from head
OpenPOWER on IntegriCloud