diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-11 21:03:32 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-12 12:59:30 +0200 |
| commit | 064b9721df5ea108e8f0011b238bb19b0b620730 (patch) | |
| tree | 4345b300cb486aaec9e77db1a921a375429d6a7f | |
| parent | 54a4689ec78fafa6c6a7926d8d26d20f05a2bf7b (diff) | |
| download | aports-064b9721df5ea108e8f0011b238bb19b0b620730.tar.bz2 aports-064b9721df5ea108e8f0011b238bb19b0b620730.tar.xz | |
testing/sbcl: fix reported version, don't read it from git
| -rw-r--r-- | testing/sbcl/APKBUILD | 4 | ||||
| -rw-r--r-- | testing/sbcl/fix-generate-version.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/testing/sbcl/APKBUILD b/testing/sbcl/APKBUILD index e819212e03..92dacd1e2c 100644 --- a/testing/sbcl/APKBUILD +++ b/testing/sbcl/APKBUILD @@ -14,6 +14,7 @@ source="$pkgname-$pkgver.tar.bz2::http://prdownloads.sourceforge.net/$pkgname/$p ignore-test-failure.patch musl-fixes.patch sbcl_prefix.patch + fix-generate-version.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -49,4 +50,5 @@ sha512sums="e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03 cda5c7268b314145a1bdb8293c7970e077aebf3cce5dace12542bf18beb7b124bf97f4754906f2f681428869ca3060300b88cab80055a3d5881dfcdcfbe51d6d pax-genesis-stage-two.patch fcaf0754084d705b263cbca20988e2cacc96470d4f0f2e15b812678ba8d15a43de2b3ebd87648f6540833615fdbde0011f72ce7800b02dcbd8055229eb439ec3 ignore-test-failure.patch 19bb9dac5997366c9778e349b707970832c5020ac55f0099dd652a8cc8c43336d34a33db2e4f7f190ab8212b064718f6999b832c249a4de7d24eae2186d6acea musl-fixes.patch -bfb6bef3b6512e487e45bc8c9cf36aa519e470690b6c7036bba7d28269bd899c60a4dfa09b5aba44830b8c002e7191276f2cf6f8f134b163d05af7b46f9849ff sbcl_prefix.patch" +bfb6bef3b6512e487e45bc8c9cf36aa519e470690b6c7036bba7d28269bd899c60a4dfa09b5aba44830b8c002e7191276f2cf6f8f134b163d05af7b46f9849ff sbcl_prefix.patch +acd6a154e539dde5c8c6726cc553cc79b1ba98670f61596a3f7754126de35fae1656c98963169ec5dff1551d33632e00e1a40fa65aec73a729317d814825c6a1 fix-generate-version.patch" diff --git a/testing/sbcl/fix-generate-version.patch b/testing/sbcl/fix-generate-version.patch new file mode 100644 index 0000000000..521520e86a --- /dev/null +++ b/testing/sbcl/fix-generate-version.patch @@ -0,0 +1,13 @@ +Don't read sbcl version from the aports git repository. + +--- a/generate-version.sh ++++ b/generate-version.sh +@@ -2,7 +2,7 @@ + + git_available_p() { + # Check that (1) we have git (2) this is a git tree. +- if ( command -v git >/dev/null && git describe >/dev/null 2>/dev/null ) ++ if ( test -d .git && command -v git >/dev/null && git describe >/dev/null 2>/dev/null ) + then + echo "ok" + else |