From f0dc24c8d5a25aa2ffe94d492e66499536aa94ab Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 24 Dec 2017 00:01:40 +0100 Subject: [PATCH] librsync: Update from 2.0.0 to 2.0.1 Closes #1963 and #1966. --- packages/librsync/CMakeLists.txt.patch | 20 ++++++++++++++++++++ packages/librsync/build.sh | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/librsync/CMakeLists.txt.patch diff --git a/packages/librsync/CMakeLists.txt.patch b/packages/librsync/CMakeLists.txt.patch new file mode 100644 index 00000000..7a5b49c5 --- /dev/null +++ b/packages/librsync/CMakeLists.txt.patch @@ -0,0 +1,20 @@ +Patch submitted upstream at https://github.com/librsync/librsync/pull/136 +diff -u -r ../librsync-2.0.1/CMakeLists.txt ./CMakeLists.txt +--- ../librsync-2.0.1/CMakeLists.txt 2017-10-17 03:45:57.000000000 +0200 ++++ ./CMakeLists.txt 2017-12-23 23:34:02.239823106 +0100 +@@ -108,8 +108,13 @@ + check_type_size ( "unsigned short" SIZEOF_UNSIGNED_SHORT ) + + # Check for printf "%zu" size_t formating support. +-include(CheckCSourceRuns) +-check_c_source_runs("#include \nint main(){char o[8];sprintf(o, \"%zu\", (size_t)7);return o[0] != '7';}" HAVE_PRINTF_Z) ++if(CMAKE_CROSSCOMPILING) ++ set(HAVE_PRINTF_Z ON) ++ message (STATUS "Cross compiling - assuming printf \"%zu\" size_t formating support") ++else() ++ include(CheckCSourceRuns) ++ check_c_source_runs("#include \nint main(){char o[8];sprintf(o, \"%zu\", (size_t)7);return o[0] != '7';}" HAVE_PRINTF_Z) ++endif() + + include (TestBigEndian) + TEST_BIG_ENDIAN(WORDS_BIGENDIAN) diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh index 7a5ea5db..59171f5e 100644 --- a/packages/librsync/build.sh +++ b/packages/librsync/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/librsync/librsync TERMUX_PKG_DESCRIPTION="Remote delta-compression library" -TERMUX_PKG_VERSION=2.0.0 +TERMUX_PKG_VERSION=2.0.1 +TERMUX_PKG_SHA256=6fce69041aa4fc72a21f1ab280a7299b82df2b1fa0a25d8695fd527e6752625e TERMUX_PKG_SRCURL=https://github.com/librsync/librsync/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 TERMUX_PKG_DEPENDS="libbz2" TERMUX_PKG_BUILD_DEPENDS="libpopt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=`which perl`" -- 2.11.0