[vlc-commits] Contribs, Fribidi: allow to not build bins nor tests

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 29 19:04:19 2020 +0200| [fbd0076e3b19723ebe663cfbd1f9c8549241141e] | committer: Jean-Baptiste Kempf

Contribs, Fribidi: allow to not build bins nor tests

Patch submitted upstream

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

 contrib/src/fribidi/meson_no_bins.patch | 41 +++++++++++++++++++++++++++++++++
 contrib/src/fribidi/rules.mak           |  3 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/contrib/src/fribidi/meson_no_bins.patch b/contrib/src/fribidi/meson_no_bins.patch
new file mode 100644
index 0000000000..a9b51a9abe
--- /dev/null
+++ b/contrib/src/fribidi/meson_no_bins.patch
@@ -0,0 +1,41 @@
+From 84d7caf52322a33deed868655d19ed2b41c226a9 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sun, 29 Mar 2020 18:57:39 +0200
+Subject: [PATCH] meson: allow to disable building tests and binaries
+
+---
+ meson.build       | 8 ++++++--
+ meson_options.txt | 4 ++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 75e796e..03e9388 100644
+--- a/meson.build
++++ b/meson.build
+@@ -84,8 +84,12 @@ incs = include_directories('.', 'lib', 'gen.tab')
+ 
+ subdir('gen.tab')
+ subdir('lib')
+-subdir('bin')
+-subdir('test')
++if get_option('bin')
++  subdir('bin')
++endif
++if get_option('tests')
++   subdir('test')
++endif
+ if get_option('docs')
+   subdir('doc')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index c312fe8..11cae8d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,3 +2,7 @@ option('deprecated', type : 'boolean', value : true,
+   description: 'Build deprecated functionality')
+ option('docs', type : 'boolean', value : true,
+   description: 'Build documentation')
++option('bin', type : 'boolean', value : true,
++  description: 'Build binaries')
++option('tests', type : 'boolean', value : true,
++  description: 'Build tests')
diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak
index 4757e95d23..51533ecf35 100644
--- a/contrib/src/fribidi/rules.mak
+++ b/contrib/src/fribidi/rules.mak
@@ -14,11 +14,12 @@ $(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.xz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
 	$(UNPACK)
+	$(APPLY) $(SRC)/fribidi/meson_no_bins.patch
 	$(MOVE)
 
 # FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
 .fribidi: fribidi crossfile.meson
 	cd $< && rm -rf ./build
-	cd $< && $(HOSTVARS_MESON) $(MESON) -Ddocs=false build
+	cd $< && $(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false build
 	cd $< && cd build && ninja install
 	touch $@