From 7e852575bb75fab5a6dc0a356705f2abbb78aa20 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 4 Dec 2022 03:20:26 +0900 Subject: [PATCH] keystone: Fix installation path --- packages/keystone/CMakeLists.txt.patch | 10 ++++++++++ packages/keystone/build.sh | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/keystone/CMakeLists.txt.patch diff --git a/packages/keystone/CMakeLists.txt.patch b/packages/keystone/CMakeLists.txt.patch new file mode 100644 index 0000000000..79fbd42b97 --- /dev/null +++ b/packages/keystone/CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,7 +50,6 @@ + # handle cases where the libdir should be lib/, lib64/, or lib// + # depending on the target system and cmake options. + include(GNUInstallDirs) +- string(REGEX REPLACE "lib(.*)$" "\\1" LLVM_LIBDIR_SUFFIX "${CMAKE_INSTALL_LIBDIR}") + set(LLVM_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING "Define suffix of library directory name (32/64)") + endif() + diff --git a/packages/keystone/build.sh b/packages/keystone/build.sh index 7c21bf165b..db1150c1c5 100644 --- a/packages/keystone/build.sh +++ b/packages/keystone/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Keystone is a lightweight multi-platform, multi-architec TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.9.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/keystone-engine/keystone/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c9b3a343ed3e05ee168d29daf89820aff9effb2c74c6803c2d9e21d55b5b7c24 TERMUX_PKG_AUTO_UPDATE=true @@ -13,4 +13,6 @@ TERMUX_PKG_REPLACES="keystone-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPYTHON_EXECUTABLE=$(command -v python2.7) --DBUILD_SHARED_LIBS=ON" +-DBUILD_SHARED_LIBS=ON +-DLLVM_LIBDIR_SUFFIX= +"