[vlc-devel] [PATCH] contrib: allow using prebuilt packages when cross-compiling

Rémi Denis-Courmont remi at remlab.net
Thu Jan 30 17:21:46 CET 2020


Le torstaina 30. tammikuuta 2020, 17.13.02 EET Steve Lhomme a écrit :
> In the case of Raspbian there's a heavily patched libavcodec which we can
> access through pre-built packages.
> Qt cross compiling also a major PITA which we can avoid this way.
> ---
>  contrib/src/main.mak | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 27722baf513..1b7ff3190f3 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -45,13 +45,10 @@ ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
>  HAVE_WIN64 := 1
>  endif
> 
> +need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
>  ifdef HAVE_CROSS_COMPILE
> -need_pkg = 1
> -else
>  ifeq ($(findstring mingw32,$(BUILD)),mingw32)
>  need_pkg = $(shell PKG_CONFIG_LIBDIR="${PKG_CONFIG_PATH}" $(PKG_CONFIG)
> $(1) || echo 1) -else
> -need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
>  endif
>  endif

Are we always setting the cross-pkg-config correctly? The hack is there because 
we did not back way back when.

-- 
Rémi Denis-Courmont
http://www.remlab.net/





More information about the vlc-devel mailing list