]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r339873:
authorGlen Barber <gjb@FreeBSD.org>
Wed, 31 Oct 2018 23:54:36 +0000 (23:54 +0000)
committerGlen Barber <gjb@FreeBSD.org>
Wed, 31 Oct 2018 23:54:36 +0000 (23:54 +0000)
commitb6eaf36aa3fb5588984b9f299c8a58099d415a79
treefe2021357403c894dd829f5b9019fccb65abc639
parentfdc0a80de86e42e974c9f6738f6ad078e1191f24
MFC r339873:
 Set OPTIONS_UNSET in the argument list to env(1), and add
 AVAHI to the list.  This fixes the textproc/docproj build
 seemingly following FLAVORS being added.

 Specifically, the problem with the dependency chain here is:
 - textproc/docproj depends on print/cups, which sets AVAHI=on
   by default;
 - net/avahi-app depends on devel/gobject-introspection, which
   requires python3+;
 - graphics/netpbm depends on graphics/mesa-libs, which can
   only be built with python2.7;
 - textproc/docproj depends on a number of graphics ports for
   font rendering, etc.

MFC r339875:
 Pass _BRANCH in the reldoc target to ensure the correct
 src branch is used when generating the hardware.html page.

Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
release/Makefile
release/release.sh