[Buildroot] [PATCH 1/4] package/alsa-lib: disable topology modules for static builds

* [Buildroot] [PATCH 1/4] package/alsa-lib: disable topology modules for static builds
@ 2022-10-28 19:15 Bernd Kuhls
  2022-10-28 19:15 ` [Buildroot] [PATCH 2/4] package/alsa-plugins: bump version to 1.2.7.1 Bernd Kuhls
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Bernd Kuhls @ 2022-10-28 19:15 UTC (permalink / raw)
  To: buildroot; +Cc: Charles Hardin

With this fix to alsa-lib we can remove a patch from alsa-utils which
fixed its static build. A static build of topology modules is not
supported by upstream however:

"Note that it does not make sense to build static topology modules.
 They are not usable."
https://github.com/alsa-project/alsa-utils/issues/152#issuecomment-1144485929

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/alsa-lib/alsa-lib.mk                  |  1 +
 ...nfigure.ac-fix-build-without-dlfcn.h.patch | 48 -------------------
 package/alsa-utils/alsa-utils.mk              |  3 --
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index f3ed195a5c..6e474aa5e2 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -25,6 +25,7 @@ endif
 # Can't build with static & shared at the same time (1.0.25+)
 ifeq ($(BR2_STATIC_LIBS),y)
 ALSA_LIB_CONF_OPTS += \
+	--disable-topology \
 	--enable-shared=no \
 	--without-libdl
 else
diff --git a/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch b/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch
deleted file mode 100644
index 69dae5102c..0000000000
--- a/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0e74339bf0751932abf6aa49bf07aa1c035f9ec6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 14 Aug 2022 20:31:30 +0200
-Subject: [PATCH] configure.ac: fix build without dlfcn.h
-
-Fix the following static build failure (i.e. without dlfcn.h) raised
-since version 1.2.7 and
-https://github.com/alsa-project/alsa-utils/commit/44d3e8aa44fc12f95bfeef0e3a1051e8f77047b5:
-
-pre-processor.c:28:10: fatal error: dlfcn.h: No such file or directory
-   28 | #include <dlfcn.h>
-      |          ^~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/1173a1ee28a58ce565a3274f35e868c35bb2e04e
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/alsa-project/alsa-utils/pull/165]
----
- configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 20cbb68..6833800 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,9 @@ AC_CHECK_FUNC([snd_ctl_elem_add_enumerated],
- 	      , [AC_ERROR([No user enum control support in alsa-lib])])
- fi
- 
-+
-+AC_CHECK_HEADERS([dlfcn.h])
-+
- dnl Check components
- AC_CHECK_HEADERS([alsa/pcm.h], [have_pcm="yes"], [have_pcm="no"],
-   [#include <alsa/asoundlib.h>])
-@@ -74,7 +77,7 @@ AM_CONDITIONAL(HAVE_MIXER, test "$have_mixer" = "yes")
- AM_CONDITIONAL(HAVE_RAWMIDI, test "$have_rawmidi" = "yes")
- AM_CONDITIONAL(HAVE_SEQ, test "$have_seq" = "yes")
- AM_CONDITIONAL(HAVE_UCM, test "$have_ucm" = "yes")
--AM_CONDITIONAL(HAVE_TOPOLOGY, test "$have_topology" = "yes")
-+AM_CONDITIONAL(HAVE_TOPOLOGY, test "$have_topology" = "yes" -a "$ac_cv_header_dlfcn_h" = "yes")
- AM_CONDITIONAL(HAVE_SAMPLERATE, test "$have_samplerate" = "yes")
- AM_CONDITIONAL(HAVE_FFADO, test "$have_ffado" = "yes")
- 
--- 
-2.35.1
-
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index 1b16a2457a..65a7853c79 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -15,9 +15,6 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(TARGET_NLS_DEPENDENCIES)
 
-# We're patching configure.ac
-ALSA_UTILS_AUTORECONF = YES
-
 ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL),y)
 ALSA_UTILS_SELINUX_MODULES += alsa
 endif
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread