Commit ed3ac886 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d97db71d
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
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