From 171c81db0af5728fb0b070ef65b4e094a0b2888b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 May 2019 14:11:48 -0700 Subject: [PATCH] zstd: Fix compilation on uClibc-ng uClibc-ng defines __GLIBCC__ and does not compile in execinfo.h. Disable it. Signed-off-by: Rosen Penev --- utils/zstd/Makefile | 2 +- utils/zstd/patches/010-uClibc-ng.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 utils/zstd/patches/010-uClibc-ng.patch diff --git a/utils/zstd/Makefile b/utils/zstd/Makefile index dff96d6ffb..865dc73b3a 100644 --- a/utils/zstd/Makefile +++ b/utils/zstd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zstd PKG_VERSION:=1.4.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)? diff --git a/utils/zstd/patches/010-uClibc-ng.patch b/utils/zstd/patches/010-uClibc-ng.patch new file mode 100644 index 0000000000..552286becc --- /dev/null +++ b/utils/zstd/patches/010-uClibc-ng.patch @@ -0,0 +1,11 @@ +--- a/programs/fileio.c ++++ b/programs/fileio.c +@@ -175,7 +175,7 @@ static void clearHandler(void) + + #if !defined(BACKTRACE_ENABLE) + /* automatic detector : backtrace enabled by default on linux+glibc and osx */ +-# if (defined(__linux__) && defined(__GLIBC__)) \ ++# if (defined(__linux__) && (defined(__GLIBC__) && !defined(__UCLIBC__))) \ + || (defined(__APPLE__) && defined(__MACH__)) + # define BACKTRACE_ENABLE 1 + # else