From ed3ac88635ce51591f4b7195f7078d86cfbfc382 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Jan 2011 14:53:35 +0100 Subject: 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 --- .../autoconf-2.65-dont-add-dirty-to-version.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch 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 000000000..38ac16382 --- /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 +--- + 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 + -- cgit v1.2.3