Parcourir la source

flac: Fix musl x86 build (__sigemptyset undefined)

Signed-off-by: Ted Hess <thess@kitschensync.net>
Ted Hess il y a 9 ans
Parent
révision
1263599f96
2 fichiers modifiés avec 13 ajouts et 2 suppressions
  1. 2
    2
      libs/flac/Makefile
  2. 11
    0
      libs/flac/patches/020-fix-musl-sigemptyset-x86.patch

+ 2
- 2
libs/flac/Makefile Voir le fichier

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2006-2015 OpenWrt.org
2
+# Copyright (C) 2006-2016 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=flac
11 11
 PKG_VERSION:=1.3.1
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 15
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/flac/

+ 11
- 0
libs/flac/patches/020-fix-musl-sigemptyset-x86.patch Voir le fichier

@@ -0,0 +1,11 @@
1
+--- a/src/libFLAC/cpu.c
2
++++ b/src/libFLAC/cpu.c
3
+@@ -243,7 +243,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
4
+ 		struct sigaction sigill_save;
5
+ 		struct sigaction sigill_sse;
6
+ 		sigill_sse.sa_sigaction = sigill_handler_sse_os;
7
+-		__sigemptyset(&sigill_sse.sa_mask);
8
++		sigemptyset(&sigill_sse.sa_mask);
9
+ 		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 */
10
+ 		if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save))
11
+ 		{