]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
alsa-lib: fix noMMU build
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 9 Mar 2013 08:21:27 +0000 (08:21 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 9 Mar 2013 20:08:53 +0000 (21:08 +0100)
Add a patch to use vfork() instead of fork().

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/alsa-lib/alsa-lib-no-mmu.patch [new file with mode: 0644]
package/alsa-lib/alsa-lib.mk

diff --git a/package/alsa-lib/alsa-lib-no-mmu.patch b/package/alsa-lib/alsa-lib-no-mmu.patch
new file mode 100644 (file)
index 0000000..317676a
--- /dev/null
@@ -0,0 +1,44 @@
+Don't use fork() on noMMU platforms
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: alsa-lib-1.0.26/configure.in
+===================================================================
+--- alsa-lib-1.0.26.orig/configure.in  2012-09-06 10:55:14.000000000 +0200
++++ alsa-lib-1.0.26/configure.in       2013-03-09 16:22:08.000000000 +0100
+@@ -66,6 +66,8 @@
+ AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes])
+ AC_CHECK_FUNCS([uselocale])
++AC_CHECK_FUNC([fork])
++
+ SAVE_LIBRARY_VERSION
+ AC_SUBST(LIBTOOL_VERSION_INFO)
+Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c
+===================================================================
+--- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c  2012-09-06 10:55:14.000000000 +0200
++++ alsa-lib-1.0.26/src/pcm/pcm_direct.c       2013-03-09 16:22:51.000000000 +0100
+@@ -424,13 +424,21 @@
+               close(dmix->server_fd);
+               return ret;
+       }
+-      
++
++#ifdef HAVE_FORK
+       ret = fork();
++#else
++      ret = vfork();
++#endif
+       if (ret < 0) {
+               close(dmix->server_fd);
+               return ret;
+       } else if (ret == 0) {
++#ifdef HAVE_FORK
+               ret = fork();
++#else
++              ret = vfork();
++#endif
+               if (ret == 0)
+                       server_job(dmix);
+               _exit(EXIT_SUCCESS);
index ba222db3a893aa314da57f20280d5407e6939bef..2856407680c77c153d2c971ba6fdd981f46a8ee4 100644 (file)
@@ -11,6 +11,7 @@ ALSA_LIB_LICENSE = LGPLv2.1+
 ALSA_LIB_LICENSE_FILES = COPYING
 ALSA_LIB_INSTALL_STAGING = YES
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+ALSA_LIB_AUTORECONF = YES
 ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
                    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
                    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \