From cb44cd60c499d78592170d88a3c9f03991071e10 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 21 Jul 2020 14:06:39 -0700 Subject: [PATCH] liblz4: add patch removing distutils requirement Allows meson to compile on systems that lack distutils. Signed-off-by: Rosen Penev --- libs/liblz4/Makefile | 2 +- libs/liblz4/patches/020-distutils.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libs/liblz4/patches/020-distutils.patch diff --git a/libs/liblz4/Makefile b/libs/liblz4/Makefile index 9bf064669..2e70f1d13 100644 --- a/libs/liblz4/Makefile +++ b/libs/liblz4/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liblz4 PKG_VERSION:=1.9.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/lz4/lz4/tar.gz/v$(PKG_VERSION)? diff --git a/libs/liblz4/patches/020-distutils.patch b/libs/liblz4/patches/020-distutils.patch new file mode 100644 index 000000000..d0ac62b40 --- /dev/null +++ b/libs/liblz4/patches/020-distutils.patch @@ -0,0 +1,13 @@ +--- a/contrib/meson/meson.build ++++ b/contrib/meson/meson.build +@@ -35,8 +35,8 @@ compiler_msvc = 'msvc' + lz4_version = meson.project_version() + + lz4_h_file = join_paths(meson.current_source_dir(), '../../lib/lz4.h') +-GetLz4LibraryVersion_py = files('GetLz4LibraryVersion.py') +-r = run_command(python3, GetLz4LibraryVersion_py, lz4_h_file) ++GetLz4LibraryVersion_py = find_program('GetLz4LibraryVersion.py', native : true) ++r = run_command(GetLz4LibraryVersion_py, lz4_h_file) + if r.returncode() == 0 + lz4_version = r.stdout().strip() + message('Project version is now: @0@'.format(lz4_version))