Dapper, git, and version-stamp pain again

[Dan Kegel]

On one of my dapper boxes (an old laptop), I got the error

main.o: In function
`check_command_line':/home/dank/wine-git/loader/main.c:89: undefined
reference to `wine_version'

today.  Turns out the version-stamp rule in loader/Makefile is
misbehaving; I had to hack that rule to not invoke git at all.
Hmm.  I remember having to do that before.  Oh, yeah, it's
coming back to me now:

Dapper's "git --version" reports 1.1.3, and
http://wiki.winehq.org/GitWine#head-f90aa63f963ccd6f1b34f59e4fdaafaecc72ad18
says that's too old.  Grr.

I guess I should submit a patch that checks git's version
and doesn't break the build if it's only 1.1.3...
it'd save me fifteen minutes next time I forget about this...
- Dan

[Duane Clark]

Dan Kegel wrote:
> On one of my dapper boxes (an old laptop), I got the error
>
> main.o: In function
> `check_command_line':/home/dank/wine-git/loader/main.c:89: undefined
> reference to `wine_version'
>
> today.  Turns out the version-stamp rule in loader/Makefile is
> misbehaving; I had to hack that rule to not invoke git at all.
> Hmm.  I remember having to do that before.  Oh, yeah, it's
> coming back to me now:
>
> Dapper's "git --version" reports 1.1.3, and
> http://wiki.winehq.org/GitWine#head-f90aa63f963ccd6f1b34f59e4fdaafaecc72ad18
> says that's too old.  Grr.
>
> I guess I should submit a patch that checks git's version
> and doesn't break the build if it's only 1.1.3...
> it'd save me fifteen minutes next time I forget about this...
> - Dan

At least with git 1.1.4, I seem to need the attached patch to create a 
valid wine_version.

Subject: [PATCH] Seems to be needed.

---

loader/Makefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

70e18f05992192ef78dc6e2eb3a5002ba804ca6c
diff --git a/loader/Makefile.in b/loader/Makefile.in
index f3e365f..9b256ab 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -68,7 +68,7 @@ clean::
    $(RM) version.c version-stamp

version-stamp: dummy
-	(GIT_DIR=$(TOPSRCDIR)/.git git-describe 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -e 's/(.*)/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1)
+	(GIT_DIR=$(TOPSRCDIR)/.git git-describe master 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -e 's/(.*)/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1)

version.c: version-stamp
    @cmp -s version-stamp $@ || cp version-stamp $@