From 30addee83ab6f1fc7673ede6cd0babb4d79dcdc5 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 3 May 2019 15:53:54 +0300
Subject: [PATCH] liblzma: build versioned library

---
 packages/apt/build.sh            |  2 +-
 packages/dpkg/build.sh           |  2 +-
 packages/libarchive/build.sh     |  2 +-
 packages/liblzma/build.sh        |  1 +
 packages/liblzma/configure.patch | 39 ++++++++++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 packages/liblzma/configure.patch

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 7ad52a819..d55cf485f 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec, zlib"
 TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="unstable-repo"
 TERMUX_PKG_VERSION=1.4.9
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh
index 0adf9d4ee..0956a6201 100644
--- a/packages/dpkg/build.sh
+++ b/packages/dpkg/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.19.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=c15234e98655689586bff2d517a6fdc6135d139c54d52ae9cfa6a90007fee0ae
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/libarchive/build.sh b/packages/libarchive/build.sh
index 3f329f806..db69b753a 100644
--- a/packages/libarchive/build.sh
+++ b/packages/libarchive/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.libarchive.org/
 TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=3.3.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e
 TERMUX_PKG_SRCURL=https://www.libarchive.org/downloads/libarchive-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libbz2, liblzma, libxml2, openssl, zlib"
diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh
index 39848abcc..709437d98 100644
--- a/packages/liblzma/build.sh
+++ b/packages/liblzma/build.sh
@@ -2,5 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://tukaani.org/xz/
 TERMUX_PKG_DESCRIPTION="XZ-format compression library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=5.2.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz
diff --git a/packages/liblzma/configure.patch b/packages/liblzma/configure.patch
new file mode 100644
index 000000000..2374768c2
--- /dev/null
+++ b/packages/liblzma/configure.patch
@@ -0,0 +1,39 @@
+diff -uNr xz-5.2.4/configure xz-5.2.4.mod/configure
+--- xz-5.2.4/configure	2018-04-29 19:01:24.000000000 +0300
++++ xz-5.2.4.mod/configure	2019-05-03 15:50:52.793155366 +0300
+@@ -14026,26 +14026,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-linux*android*)
+-  version_type=none # Android doesn't support versioned libraries.
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='$libname$release$shared_ext'
+-  soname_spec='$libname$release$shared_ext'
+-  finish_cmds=
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+-
+-  dynamic_linker='Android linker'
+-  # Don't embed -rpath directories since the linker doesn't support them.
+-  hardcode_libdir_flag_spec='-L$libdir'
+-  ;;
+-
+ # This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   version_type=linux # correct to gnu/linux during the next big refactor
+@@ -14053,7 +14033,7 @@
+   need_version=no
+   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+   soname_spec='$libname$release$shared_ext$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  finish_cmds=
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+