summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-01-26 13:53:35 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-01-26 13:57:00 (GMT)
commited3ac88635ce51591f4b7195f7078d86cfbfc382 (patch)
tree870e72c7e81b53a7047015e95d3e791b257367de
parentd97db71d10054999517f4fc44c669624c72ff16a (diff)
downloadbuildroot-ed3ac88635ce51591f4b7195f7078d86cfbfc382.tar.gz
buildroot-ed3ac88635ce51591f4b7195f7078d86cfbfc382.tar.bz2
autoconf: don't append -dirty to version number if built in buildroot git tree
Autoconf would append -dirty to it's version number, causing build breakage with packages explicitly requesting autoconf 2.65, if built in a subdir of a git tree with uncommitted changes. This is a relatively common situation when developing on BR. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch b/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
new file mode 100644
index 0000000..38ac163
--- /dev/null
+++ b/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
@@ -0,0 +1,30 @@
+autoconf: don't append -dirty to version
+
+Don't append -dirty to autoconf version number if the buildroot git tree
+has uncommited changes.
+
+This script is meant for the autoconf developers, but it also activates
+if you build autoconf in a subdirectory of a git tree (E.G. like how it's
+commonly done in buildroot).
+
+The affect is that autoconf gets built as being version 2.65-dirty, which
+breaks programs (like Python) which explicitly checks for autoconf-2.65.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ build-aux/git-version-gen | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: autoconf-2.65/build-aux/git-version-gen
+===================================================================
+--- autoconf-2.65.orig/build-aux/git-version-gen
++++ autoconf-2.65/build-aux/git-version-gen
+@@ -135,7 +135,7 @@ case "$dirty" in
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+- *) v="$v-dirty" ;;
++ #*) v="$v-dirty" ;;
+ esac ;;
+ esac
+