Skip to content

Commit c555f0f

Browse files
committed
ports-mgmt/poudriere: Bring in fix for distclean make.conf error
Fixes freebsd/poudriere#910
1 parent 9dae753 commit c555f0f

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

‎ports-mgmt/poudriere/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= poudriere
22
DISTVERSION= 3.3.7
3-
PORTREVISION= 0
3+
PORTREVISION= 1
44
CATEGORIES= ports-mgmt
55
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
66
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
commit 8bfaa898b32370bbfff9bf37fc833d7abc4b8b67
2+
Author: Bryan Drewery <bryan@shatow.net>
3+
Date: Sat Aug 28 11:57:56 2021 -0700
4+
5+
distclean: Fix reading make.conf
6+
7+
Fixes #910
8+
Fixes fa0308152e6 ("Move make.conf ports_env handling to its own not-spammy file")
9+
10+
(cherry picked from commit 95971acb6ffd51b2432a38efd1111dd189f68edd)
11+
12+
diff --git src/share/poudriere/distclean.sh src/share/poudriere/distclean.sh
13+
index 08889f1dd..f77163fc4 100755
14+
--- src/share/poudriere/distclean.sh
15+
+++ src/share/poudriere/distclean.sh
16+
@@ -144,7 +144,7 @@ for PTNAME in ${PTNAMES}; do
17+
18+
__MAKE_CONF=$(mktemp -t poudriere-make.conf)
19+
export __MAKE_CONF
20+
- setup_ports_env "/" "${__MAKE_CONF}"
21+
+ setup_ports_env "" "${__MAKE_CONF}"
22+
if [ -z "${NO_PACKAGE_BUILDING}" ]; then
23+
echo "BATCH=yes"
24+
echo "PACKAGE_BUILDING=yes"

0 commit comments

Comments
 (0)