Browse Source

Merge pull request #8870 from neheb/zst

zstd: Fix compilation on uClibc-ng
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
1ad8faa86f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
  1. +1
    -1
      utils/zstd/Makefile
  2. +11
    -0
      utils/zstd/patches/010-uClibc-ng.patch

+ 1
- 1
utils/zstd/Makefile View File

@ -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)?


+ 11
- 0
utils/zstd/patches/010-uClibc-ng.patch View File

@ -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

Loading…
Cancel
Save