aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-10-29 20:53:05 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-10-29 20:53:05 +0000
commit4de042ec892bdb2827632a00c17ae844cd87a271 (patch)
treeee2dd033326d4c608f985be863d3b1dd1ef2b70b /release/release.sh
parent78a4913881ad6dde50c75bc758316dcda1aae7aa (diff)
downloadsrc-4de042ec892bdb2827632a00c17ae844cd87a271.tar.gz
src-4de042ec892bdb2827632a00c17ae844cd87a271.zip
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
Notes
Notes: svn path=/head/; revision=339873
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/release.sh b/release/release.sh
index 68b56f21bf11..cff917949cf9 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -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