[vlc-devel] [PATCH v2 10/13] contrib: add UNPACK1 command to UNPACK and remove one directory level

[Steve Lhomme]

It is required because their packages extract to an extra folder, and 
the $(MOVE) command won't remove it properly. Maybe a MOVE1 or something 
like that could be introduced instead.

We may also leave the empty folder there, but it may cause problems when 
extracting a newer package that end up in the same directory.

It may also be possible to do the removal in each target after the 
$(MOVE) call. Maybe that would be the cleaner more consistent option.

On 2020-07-07 19:11, Rémi Denis-Courmont wrote:
> I don't see how this is "required". More directories are not a problem. 
> Only less (meaning zero) directories are a problem.
> 
> -1.
> 
> Le 7 juillet 2020 08:29:31 GMT+02:00, Steve Lhomme <robux4 at ycbcr.xyz> a 
> écrit :
> 
>     This is necessary for some targets that use more directory levels than usual.
>     ------------------------------------------------------------------------
>       contrib/src/main.mak | 4 ++++
>       1 file changed, 4 insertions(+)
> 
>     diff --git a/contrib/src/main.mak b/contrib/src/main.mak
>     index 6cf9037c92d..d5ddd3aad78 100644
>     --- a/contrib/src/main.mak
>     +++ b/contrib/src/main.mak
>     @@ -377,6 +377,10 @@ UNPACK = $(RM) -R $@ \
>       	$(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f)) \
>       	$(foreach f,$(filter %.tar.xz,$^), && tar xvJfo $(f)) \
>       	$(foreach f,$(filter %.zip,$^), && unzip $(f))
>     +UNPACK1 = $(RM) -Rf $@ $(UNPACK_DIR) && mkdir -p $(UNPACK_DIR) \
>     +	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f) --strip-components=1 -C $(UNPACK_DIR)) \
>     +	$(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f) --strip-components=1 -C $(UNPACK_DIR)) \
>     +	$(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f) --strip-components=1 -C $(UNPACK_DIR))
>       UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
>       APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
>       pkg_static = (cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-static.sh $(1))
> 
> 
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser 
> ma brièveté.
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>