Date: Wed, 31 Oct 2018 23:54:36 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r339980 - stable/12/release Message-ID: <201810312354.w9VNsaBd036181@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Oct 31 23:54:36 2018 New Revision: 339980 URL: https://svnweb.freebsd.org/changeset/base/339980 Log: 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 Modified: stable/12/release/Makefile stable/12/release/release.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/release/Makefile ============================================================================== --- stable/12/release/Makefile Wed Oct 31 23:17:00 2018 (r339979) +++ stable/12/release/Makefile Wed Oct 31 23:54:36 2018 (r339980) @@ -174,6 +174,7 @@ reldoc: cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \ env MAN4DIR=${WORLDDIR}/share/man/man4 \ SVN=${SVN} \ + _BRANCH=${BRANCH} \ ${MAKE} all install clean "FORMATS=html txt" \ INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \ WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc Modified: stable/12/release/release.sh ============================================================================== --- stable/12/release/release.sh Wed Oct 31 23:17:00 2018 (r339979) +++ stable/12/release/release.sh Wed Oct 31 23:54:36 2018 (r339980) @@ -287,9 +287,9 @@ extra_chroot_setup() { PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports" PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles" - chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \ + chroot ${CHROOTDIR} env ${PBUILD_FLAGS} \ + OPTIONS_UNSET="AVAHI FOP IGOR" make -C \ /usr/ports/textproc/docproj \ - OPTIONS_UNSET="FOP IGOR" \ FORCE_PKG_REGISTER=1 \ install clean distclean fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810312354.w9VNsaBd036181>