svn commit: r339873 - head/release

Glen Barber gjb at FreeBSD.org
Mon Oct 29 20:53:06 UTC 2018


Author: gjb
Date: Mon Oct 29 20:53:05 2018
New Revision: 339873
URL: https://svnweb.freebsd.org/changeset/base/339873

Log:
  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 after:	3 days
  MFC before:	12.0-BETA3
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Mon Oct 29 20:21:10 2018	(r339872)
+++ head/release/release.sh	Mon Oct 29 20:53:05 2018	(r339873)
@@ -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


More information about the svn-src-head mailing list