mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 22:11:59 -09:00
package/libshout: disable tools
This will fix static build of libshout in version 2.4.5 with openssl
(tools were added by
34a535bdbb)
Fixes:
- http://autobuild.buildroot.net/results/a6b/a6b7df5d4b4bccbfe54f3173365e88d849ed0e30/
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
8d2c4f696c
commit
f70a50423f
@@ -0,0 +1,51 @@
|
|||||||
|
From 148b56bf894192cef6dd133715e295260b934a71 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
Date: Fri, 5 Mar 2021 15:50:32 +0100
|
||||||
|
Subject: [PATCH] configure.ac: add an option to disable tools
|
||||||
|
|
||||||
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
[Upstream status:
|
||||||
|
https://gitlab.xiph.org/xiph/icecast-libshout/-/issues/2331]
|
||||||
|
---
|
||||||
|
Makefile.am | 5 ++++-
|
||||||
|
configure.ac | 5 +++++
|
||||||
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index ea855cf..79241f1 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -3,10 +3,13 @@
|
||||||
|
AUTOMAKE_OPTIONS = 1.6 foreign
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
-SUBDIRS = include src doc win32 tools
|
||||||
|
+SUBDIRS = include src doc win32
|
||||||
|
if HAVE_EXAMPLES
|
||||||
|
SUBDIRS += examples
|
||||||
|
endif
|
||||||
|
+if HAVE_TOOLS
|
||||||
|
+SUBDIRS += tools
|
||||||
|
+endif
|
||||||
|
|
||||||
|
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
|
||||||
|
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 264b9b0..34f971c 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -100,6 +100,11 @@ AC_ARG_ENABLE([examples],
|
||||||
|
AS_HELP_STRING([--disable-examples],[Do not build example code]))
|
||||||
|
AM_CONDITIONAL([HAVE_EXAMPLES],[test "${enable_examples}" != "no"])
|
||||||
|
|
||||||
|
+dnl Allow tools not to be build
|
||||||
|
+AC_ARG_ENABLE([tools],
|
||||||
|
+ AS_HELP_STRING([--disable-tools],[Do not build tools]))
|
||||||
|
+AM_CONDITIONAL([HAVE_TOOLS],[test "${enable_tools}" != "no"])
|
||||||
|
+
|
||||||
|
dnl Module checks
|
||||||
|
XIPH_NET
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
@@ -10,7 +10,11 @@ LIBSHOUT_LICENSE = LGPL-2.0+
|
|||||||
LIBSHOUT_LICENSE_FILES = COPYING
|
LIBSHOUT_LICENSE_FILES = COPYING
|
||||||
LIBSHOUT_INSTALL_STAGING = YES
|
LIBSHOUT_INSTALL_STAGING = YES
|
||||||
LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis
|
LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis
|
||||||
LIBSHOUT_CONF_OPTS = --disable-examples
|
# We're patching configure.ac
|
||||||
|
LIBSHOUT_AUTORECONF = YES
|
||||||
|
LIBSHOUT_CONF_OPTS = \
|
||||||
|
--disable-examples \
|
||||||
|
--disable-tools
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
|
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
|
||||||
LIBSHOUT_CONF_OPTS += --enable-theora
|
LIBSHOUT_CONF_OPTS += --enable-theora
|
||||||
|
|||||||
Reference in New Issue
Block a user