[vlc-commits] contrib: postproc: pass AR and RANLIB to the configure script

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Feb 15 16:43:16 2019 +0100| [de5fa74ecb63bb14b8cc2176530b3f63836814cc] | committer: Steve Lhomme

contrib: postproc: pass AR and RANLIB to the configure script

They may not be deduced correctly (when cross compiling on Msys2 they are not
prefixed properly)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de5fa74ecb63bb14b8cc2176530b3f63836814cc
---

 contrib/src/postproc/postproc-ranlib.patch | 45 ++++++++++++++++++++++++++++++
 contrib/src/postproc/rules.mak             |  3 ++
 2 files changed, 48 insertions(+)

diff --git a/contrib/src/postproc/postproc-ranlib.patch b/contrib/src/postproc/postproc-ranlib.patch
new file mode 100644
index 0000000000..0dc89eda4c
--- /dev/null
+++ b/contrib/src/postproc/postproc-ranlib.patch
@@ -0,0 +1,45 @@
+--- postproc/configure.ranlib	2019-02-15 16:40:11.186212500 +0100
++++ postproc/configure	2019-02-15 13:43:31.904482900 +0100
+@@ -95,6 +95,7 @@ Advanced options (experts only):
+   --ar=AR                  use archive tool AR [$ar_default]
+   --as=AS                  use assembler AS [$as_default]
+   --cc=CC                  use C compiler CC [$cc_default]
++  --ranlib=RANLIB          use assembler AS [$ranlib_default]
+   --ld=LD                  use linker LD
+   --host-cc=HOSTCC         use host C compiler HOSTCC
+   --host-cflags=HCFLAGS    use HCFLAGS when compiling for host
+@@ -994,6 +995,7 @@ CMDLINE_SET="
+     nm
+     optflags
+     pkg_config
++    ranlib
+     samples
+     sysinclude
+     sysroot
+@@ -1453,7 +1455,7 @@ ln_s="ln -sf"
+ nm_default="nm"
+ objformat="elf"
+ pkg_config_default=pkg-config
+-ranlib="ranlib"
++ranlib_default="ranlib"
+ yasmexe="yasm"
+ 
+ nm_opts='-g'
+@@ -1673,7 +1675,7 @@ ar_default="${cross_prefix}${ar_default}
+ cc_default="${cross_prefix}${cc_default}"
+ nm_default="${cross_prefix}${nm_default}"
+ pkg_config_default="${cross_prefix}${pkg_config_default}"
+-ranlib="${cross_prefix}${ranlib}"
++ranlib_default="${cross_prefix}${ranlib_default}"
+ 
+ sysinclude_default="${sysroot}/usr/include"
+ 
+@@ -1930,7 +1932,7 @@ test -n "$cc_type" && enable $cc_type ||
+ : ${as_default:=$cc}
+ : ${dep_cc_default:=$cc}
+ : ${ld_default:=$cc}
+-set_default ar as dep_cc ld
++set_default ar as dep_cc ld ranlib
+ 
+ test -n "$CC_DEPFLAGS" || CCDEP=$DEPEND_CMD
+ test -n "$AS_DEPFLAGS" || ASDEP=$DEPEND_CMD
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index f7e401a080..655acd5217 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -6,6 +6,8 @@ POSTPROC_VERSION := $(POSTPROC_HASH)
 
 POSTPROCCONF = \
 	--cc="$(CC)" \
+	--ar="$(AR)" \
+	--ranlib="$(RANLIB)" \
 	--disable-debug \
 	--enable-gpl \
 	--enable-postproc
@@ -124,6 +126,7 @@ $(TARBALLS)/postproc-$(POSTPROC_VERSION).tar.xz:
 postproc: postproc-$(POSTPROC_VERSION).tar.xz .sum-postproc
 	$(UNPACK)
 	$(APPLY) $(SRC)/postproc/win-pic.patch
+	$(APPLY) $(SRC)/postproc/postproc-ranlib.patch
 	$(MOVE)
 
 .postproc: postproc