[vlc-devel] [vlc-commits] contribs: gcrypt: Make sure that a git repo is available during reconfigure

[Hugo Beauzée-Luyssen]

On Wed, Dec 27, 2017, at 12:07 PM, Martin Storsjö wrote:
> vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 21 
> 11:48:16 2017 +0200| [8be62dbc7af4bb53437383d1cb01c7ef0fb36a09] | 
> committer: 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 <jb at videolan.org>
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8be62dbc7af4bb53437383d1cb01c7ef0fb36a09
> ---
> 
>  contrib/src/gcrypt/rules.mak | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
> index eff80415a1..f912b903de 100644
> --- a/contrib/src/gcrypt/rules.mak
> +++ b/contrib/src/gcrypt/rules.mak
> @@ -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
> 

Shouldn't this be done in the gcrypt folder only?
ie.
cd $< && git init && ...

Currently it causes the entire contrib build directory to turn into a git repository

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr