[vlc-commits] contrib: aribb24: add missing libm

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug  6 13:55:49 2016 +0300| [2c315ab8fc924dcac90f9eaec1793c306ad4c92d] | committer: Rémi Denis-Courmont

contrib: aribb24: add missing libm

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

 contrib/src/aribb24/libm.patch | 26 ++++++++++++++++++++++++++
 contrib/src/aribb24/rules.mak  |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/contrib/src/aribb24/libm.patch b/contrib/src/aribb24/libm.patch
new file mode 100644
index 0000000..51fcef5
--- /dev/null
+++ b/contrib/src/aribb24/libm.patch
@@ -0,0 +1,26 @@
+Add missing maths library.
+
+diff -ru aribb24-1.0.3.orig/configure.ac aribb24-1.0.3/configure.ac
+--- aribb24-1.0.3.orig/configure.ac	2016-08-06 12:04:51.260806518 +0300
++++ aribb24-1.0.3/configure.ac	2016-08-06 13:45:56.424867068 +0300
+@@ -21,6 +21,12 @@
+ 
+ AC_SUBST([PKG_REQUIRES], [$(test x$enable_shared = xno && echo ${pkg_requires})])
+ 
++AC_CHECK_LIB([m], [sqrt], [
++  LIBM="-lm"
++  LIBS="$LIBM $LIBS"
++])
++AC_SUBST(LIBM)
++
+ AC_CHECK_FUNCS([vasprintf])
+ 
+ AC_CONFIG_FILES([Makefile src/aribb24.pc])
+diff -ru aribb24-1.0.3.orig/src/aribb24.pc.in aribb24-1.0.3/src/aribb24.pc.in
+--- aribb24-1.0.3.orig/src/aribb24.pc.in	2016-08-06 12:04:51.260806518 +0300
++++ aribb24-1.0.3/src/aribb24.pc.in	2016-08-06 12:05:05.406806659 +0300
+@@ -15,3 +15,4 @@
+ Requires: @PKG_REQUIRES@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -laribb24
++Libs.private: @LIBM@
diff --git a/contrib/src/aribb24/rules.mak b/contrib/src/aribb24/rules.mak
index 8156ed6..9d3b642 100644
--- a/contrib/src/aribb24/rules.mak
+++ b/contrib/src/aribb24/rules.mak
@@ -15,12 +15,13 @@ $(TARBALLS)/aribb24-$(ARIBB24_VERSION).tar.gz:
 
 aribb24: aribb24-$(ARIBB24_VERSION).tar.gz .sum-aribb24
 	$(UNPACK)
+	$(APPLY) $(SRC)/aribb24/libm.patch
 	$(MOVE)
 
 DEPS_aribb24 = png
 
 .aribb24: aribb24
-	cd $< && ./bootstrap
+	cd $< && $(SHELL) ./bootstrap
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@