mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 19 Sep 2019 21:18:04 +0200
|
||||
Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC
|
||||
|
||||
Upstream: https://github.com/xiph/flac/pull/142
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0228a12..64cb3f2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -144,7 +144,7 @@ case "$host_cpu" in
|
||||
powerpc64|powerpc64le)
|
||||
cpu_ppc64=true
|
||||
cpu_ppc=true
|
||||
- AC_DEFINE(FLAC__CPU_PPC)
|
||||
+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC))
|
||||
AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
|
||||
AC_DEFINE(FLAC__CPU_PPC64)
|
||||
AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64])
|
||||
@@ -152,7 +152,7 @@ case "$host_cpu" in
|
||||
;;
|
||||
powerpc|powerpcle)
|
||||
cpu_ppc=true
|
||||
- AC_DEFINE(FLAC__CPU_PPC)
|
||||
+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC))
|
||||
AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
|
||||
asm_optimisation=$asm_opt
|
||||
;;
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 8589b44c573d4228a9df3ba7bffdfdf584e7b033 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Mon, 9 Jan 2017 21:38:29 +0100
|
||||
Subject: [PATCH] configure.ac: relax linux OS detection
|
||||
|
||||
Not all linux hosts match the *-pc-linux-gnu wildcard, causing build
|
||||
failures for older glibc versions where we need to link with -lrt for
|
||||
clock_gettime - E.G.:
|
||||
|
||||
- arm-unknown-linux-musleabihf
|
||||
- powerpc-unknown-linux-gnuspe
|
||||
- bfin-linux-linux-uclibc
|
||||
..
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 070ab357..235d2717 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -186,7 +186,7 @@ esac
|
||||
AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes)
|
||||
|
||||
case "$host" in
|
||||
- *-pc-linux-gnu)
|
||||
+ *-linux-*)
|
||||
sys_linux=true
|
||||
AC_DEFINE(FLAC__SYS_LINUX)
|
||||
AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux])
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,2 +1,10 @@
|
||||
# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS
|
||||
md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz
|
||||
# From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS
|
||||
sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz
|
||||
# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt
|
||||
sha256 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f flac-1.3.2.tar.xz
|
||||
sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz
|
||||
# Locally computed
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL
|
||||
sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph
|
||||
|
||||
@@ -4,15 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FLAC_VERSION = 1.3.2
|
||||
FLAC_VERSION = 1.3.3
|
||||
FLAC_SITE = http://downloads.xiph.org/releases/flac
|
||||
FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
|
||||
FLAC_INSTALL_STAGING = YES
|
||||
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries)
|
||||
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
|
||||
# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac
|
||||
|
||||
# patch touching configure.ac
|
||||
FLAC_AUTORECONF = YES
|
||||
|
||||
FLAC_CONF_OPTS = \
|
||||
--disable-cpplibs \
|
||||
--disable-xmms-plugin \
|
||||
|
||||
Reference in New Issue
Block a user