Skip to content

Commit c330f99

Browse files
committed
Don't use the "version suffix" stuff in releaseTools.sourceTarball
It's confusing.
1 parent c9e3ba4 commit c330f99

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
1+
AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
22
AC_CONFIG_SRCDIR([src/patchelf.cc])
33
AC_CONFIG_AUX_DIR([build-aux])
44
AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])

release.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ let
1111

1212

1313
tarball =
14-
pkgs.releaseTools.sourceTarball {
14+
pkgs.releaseTools.sourceTarball rec {
1515
name = "patchelf-tarball";
16-
version = builtins.readFile ./version;
17-
versionSuffix = if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}";
16+
version = builtins.readFile ./version + (if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}");
17+
versionSuffix = ""; # obsolete
1818
src = patchelfSrc;
19-
inherit officialRelease;
19+
preAutoconf = "echo ${version} > version";
2020
postDist = ''
2121
cp README $out/
2222
echo "doc readme $out/README" >> $out/nix-support/hydra-build-products

0 commit comments

Comments
 (0)