Skip to content

Commit 6909854

Browse files
committed
build: Run autogen & distclean when generating source tarball
1 parent 8d9f9f7 commit 6909854

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
230230
# Create the source tarball if not already there
231231
if [ ! -e "$GIT_ARCHIVE" ]; then
232232
mkdir -p "$(dirname "$GIT_ARCHIVE")"
233+
CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" \
233234
contrib/guix/libexec/make_release_tarball.sh "${GIT_ARCHIVE}" "${DISTNAME}"
234235
fi
235236

@@ -283,8 +284,6 @@ mkdir -p "$DISTSRC"
283284
# Extract the source tarball
284285
tar --strip-components=1 -xf "${GIT_ARCHIVE}"
285286

286-
./autogen.sh
287-
288287
# Configure this DISTSRC for $HOST
289288
# shellcheck disable=SC2086
290289
env CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" \

contrib/guix/libexec/make_release_tarball.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,24 @@ set -ex
1313
GIT_ARCHIVE="$1"
1414
DISTNAME="$2"
1515

16-
git archive --prefix="${DISTNAME}/" --output="${GIT_ARCHIVE}" HEAD
16+
git archive --prefix="${DISTNAME}/" HEAD | tar -xp
17+
cd "${DISTNAME}"
18+
19+
./autogen.sh
20+
./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
21+
make distclean
22+
23+
cd ..
24+
tar \
25+
--format=ustar \
26+
--exclude autom4te.cache \
27+
--exclude .deps \
28+
--exclude .git \
29+
--sort=name \
30+
--mode='u+rw,go+r-w,a+X' --owner=0 --group=0 \
31+
--mtime="${REFERENCE_DATETIME}" \
32+
-c "${DISTNAME}" | \
33+
gzip -9n \
34+
>"${GIT_ARCHIVE}"
35+
36+
rm -rf "${DISTNAME}"

0 commit comments

Comments
 (0)