summaryrefslogtreecommitdiffstats
path: root/package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-01 18:05:23 +0100
committerPeter Korsgaard <peter@korsgaard.com>2018-11-07 23:47:11 +0100
commitfa627bacc2eeffaba9f0287fa039864b2232d60c (patch)
treefb9c092e80f2fe9f30c77c0522a0dd1e0f7d0450 /package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
parentdc717ce33964b5b83dd6db543bcd04710cffffb6 (diff)
downloadbuildroot-fa627bacc2eeffaba9f0287fa039864b2232d60c.tar.gz
buildroot-fa627bacc2eeffaba9f0287fa039864b2232d60c.zip
package/alsa-lib: drop patch 0002-alsa-lib-provide-dummy-definitions-of-RTLD_-if-neces.patch
The description of this patch was no longer correct: it no longer provided dummy definitions of RTLD_* macros since commit ccad7db515fa79d2331e4e949aafb32eca0b5214 ("alsa-lib: bump to version 1.1.6"). All it did is make two <dlfcn.h> inclusions optional. However, this is no longer needed, since the alsa-lib code base contains four inclusions of <dlfcn.h>, which are all properly handled: - include/local.h, the include is guarded by #ifdef HAVE_LIBDL - modules/mixer/simple/sbasedl.c, modules are only built if BUILD_MODULES is enabled, and BUILD_MODULES is only enabled if HAVE_LIBDL is enabled - src/mixer/simple_abst.c, this file is only built if BUILD_MODULES is enabled, which itself is only enabled if HAVE_LIBDL is enabled - src/pcm/pcm_meter.c, this file is only built if BUILD_PCM_PLUGIN_METER is enabled, and this is not enabled if HAVE_LIBDL is not enabled. Conclusion: the patch can be dropped. The third patch is renumbered as appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch')
-rw-r--r--package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch b/package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
deleted file mode 100644
index 181e56deb4..0000000000
--- a/package/alsa-lib/0003-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2aba563bd077fda94fb9c2c33002ee0ac119b345 Mon Sep 17 00:00:00 2001
-From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-Date: Fri, 13 Apr 2018 09:13:46 +0200
-Subject: [PATCH] alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This
-breaks compilation of alsa-utils (and probably other packages using this
-macro) for targets that do not support dynamic loading, such as for
-Blackfin FLAT binaries.
-
-This patch updates the macro to check if dlopen is available, and use that
-result to conditionally add -ldl to the list of libraries.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-[Jörg: update for 1.1.6]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- utils/alsa.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/utils/alsa.m4 b/utils/alsa.m4
-index e12310df..a5c5a292 100644
---- a/utils/alsa.m4
-+++ b/utils/alsa.m4
-@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then
- fi
- AC_MSG_RESULT($ALSA_CFLAGS)
-
-+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
-+
- dnl add any special lib dirs
- AC_MSG_CHECKING(for ALSA LDFLAGS)
- if test "$alsa_prefix" != "" ; then
-@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then
- fi
-
- dnl add the alsa library
--ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread"
- LIBS="$ALSA_LIBS $LIBS"
- AC_MSG_RESULT($ALSA_LIBS)
-
---
-2.14.3
-
OpenPOWER on IntegriCloud