flac: Fix musl x86 build (__sigemptyset undefined)

Signed-off-by: Ted Hess <redacted>

diff --git a/libs/flac/Makefile b/libs/flac/Makefile
index 7d94cb63ed28654d441078b048250812f17d0eb4..0454f98f7fecd40416b6a47c2f9ea05c8c9e90c4 100644 (file)
--- a/libs/flac/Makefile
+++ b/libs/flac/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=flac
 PKG_VERSION:=1.3.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/flac/

diff --git a/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch b/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch
new file mode 100644 (file)
index 0000000..0ee3ce5
--- /dev/null
+++ b/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch
@@ -0,0 +1,11 @@
+--- a/src/libFLAC/cpu.c
++++ b/src/libFLAC/cpu.c
+@@ -243,7 +243,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
+               struct sigaction sigill_save;
+               struct sigaction sigill_sse;
+               sigill_sse.sa_sigaction = sigill_handler_sse_os;
+-              __sigemptyset(&sigill_sse.sa_mask);
++              sigemptyset(&sigill_sse.sa_mask);
+               sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */
+               if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save))
+               {