1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
From: Paul Cochrane <paul@liekut.de>
Date: Fri Apr 24 00:14:41 2015 +0200
Subject: Patch Configure.pl to determine version string correctly
The initial value of the version for MoarVM is found by looking at the
contents of the VERSION file. If we are in a git working copy, however,
then the latest tag is used as the version number. Unfortunately, in the
Debian repo, this tag isn't the one that MoarVM is expecting. Thus for
Debian packaging it is correct to only use the contents of the VERSION file.
---
Configure.pl | 5 -----
1 file changed, 5 deletions(-)
diff --git a/Configure.pl b/Configure.pl
index 38b08dc..b227eed 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -117,11 +117,6 @@ if (open(my $fh, '<', 'VERSION')) {
$VERSION = <$fh>;
close($fh);
}
-# .git is a file and not a directory in submodule
-if (-e '.git' && open(my $GIT, '-|', "git describe --tags")) {
- $VERSION = <$GIT>;
- close($GIT);
-}
chomp $VERSION;
$config{version} = $VERSION;
$config{versionmajor} = $VERSION =~ /^(\d+)/ ? $1 : 0;
|