Commit 8be62dbc authored by Martin Storsjö's avatar Martin Storsjö Committed by Jean-Baptiste Kempf

contribs: gcrypt: Make sure that a git repo is available during reconfigure

Without this, when reconfiguring, BUILD_FILEVERSION will end up with
a trailing comma with no revision number, which means that
src/versioninfo.rc will have a syntax error on build.

To reproduce/understand, download the plain gcrypt tarball;
configure contains a line like this:
    BUILD_FILEVERSION="${BUILD_FILEVERSION}45409"
After running configure, src/versioninfo.rc contains
"FILEVERSION 1,7,8,45409".

If running autoreconfigure with no enclosing git repo anywhere,
the same line in configure will end up as this:
    BUILD_FILEVERSION="${BUILD_FILEVERSION}"
After configuring, src/versioninfo.rc will now contain
"FILEVERSION 1,7,8,", which results in syntax errors.

As long as an enclosing git repo is available somewhere (if
the surrounding vlc tree contains a .git directory), this isn't
an issue though.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent bd8de0f7
......@@ -67,6 +67,9 @@ endif
endif
.gcrypt: gcrypt
# Reconfiguring this requires a git repo to be available, to
# successfully produce a nonempty mym4_revision_dec.
git init && git commit --allow-empty -m "dummy commit"
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
cd $< && $(MAKE) install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment