From a7639ce7f93f5cf15fc41eb1789ca785e99c5a0f Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Mon, 4 Mar 2019 11:38:00 +0800 Subject: [PATCH] openjpeg: disable static libs with upstream commit 66297f07a43d2770a97c8456d20202f3d051d980 --- packages/openjpeg/build.sh | 1 + .../library-installation-target.patch | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 packages/openjpeg/library-installation-target.patch diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh index 4fbb325f2..bfd5af368 100644 --- a/packages/openjpeg/build.sh +++ b/packages/openjpeg/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_VERSION=2.3.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_STATIC_LIBS=OFF" termux_step_pre_configure() { # Force symlinks to be overwritten: diff --git a/packages/openjpeg/library-installation-target.patch b/packages/openjpeg/library-installation-target.patch new file mode 100644 index 000000000..391517721 --- /dev/null +++ b/packages/openjpeg/library-installation-target.patch @@ -0,0 +1,26 @@ +From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Mon, 9 Oct 2017 11:40:43 +0200 +Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or + static-only build lacks the installation target for the library (#1019, fixes + regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b) + +--- + src/lib/openjp2/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt +index 0b452038..f8990ccf 100644 +--- a/src/lib/openjp2/CMakeLists.txt ++++ b/src/lib/openjp2/CMakeLists.txt +@@ -99,6 +99,7 @@ else() + set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) + else() + add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) ++ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) + endif() + endif() + +-- +2.21.0 +