diff options
-rw-r--r-- | package/musepack/0003-include-fpu-control-with-glibc-only.patch | 26 | ||||
-rw-r--r-- | package/musepack/0004-missing-sys-select.patch | 21 |
2 files changed, 47 insertions, 0 deletions
diff --git a/package/musepack/0003-include-fpu-control-with-glibc-only.patch b/package/musepack/0003-include-fpu-control-with-glibc-only.patch new file mode 100644 index 0000000000..6f50155781 --- /dev/null +++ b/package/musepack/0003-include-fpu-control-with-glibc-only.patch @@ -0,0 +1,26 @@ +Include <fpu_control.h> only on glibc systems + +The <fpu_control.h> header provides _FPU_*() macros, which the +Init_FPU() function uses only on i386, and only when they are +defined. Since <fpu_control.h> is not available, this causes a build +failure with C libraries such as musl. By simply including +<fpu_control.h> explicitly on glibc systems, we avoid the build +failure, since mpcenc.c already conditionally uses the <fpu_control.h> +macros only if they are defined. + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +[Thomas: better commit log.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +diff -uNr musepack_src_r475.org/mpcenc/mpcenc.h musepack_src_r475/mpcenc/mpcenc.h +--- musepack_src_r475.org/mpcenc/mpcenc.h 2009-02-23 19:15:46.000000000 +0100 ++++ musepack_src_r475/mpcenc/mpcenc.h 2016-01-30 09:29:08.000000000 +0100 +@@ -50,7 +51,7 @@ + # include <unistd.h> + #endif + +-#if defined __linux__ ++#if defined __GLIBC__ + # include <fpu_control.h> + #elif defined __FreeBSD__ + # include <machine/floatingpoint.h> diff --git a/package/musepack/0004-missing-sys-select.patch b/package/musepack/0004-missing-sys-select.patch new file mode 100644 index 0000000000..1e3a4b1140 --- /dev/null +++ b/package/musepack/0004-missing-sys-select.patch @@ -0,0 +1,21 @@ +Add missing <sys/select.h> include + +This header is needed when types like fd_set are used. This fixes a +build issue occuring on the musl C library. + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +[Thomas: better commit log.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/mpcenc/mpcenc.h +=================================================================== +--- a/mpcenc/mpcenc.h ++++ b/mpcenc/mpcenc.h +@@ -34,6 +34,7 @@ + //// portable system includes ////////////////////////////////////// + #include <stddef.h> + #include <math.h> ++#include <sys/select.h> + + //// system dependent system includes ////////////////////////////// + // low level I/O, where are prototypes and constants? |