From 43724e1f89f0a43d9b3afb4753dca6bc590d31fe Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sat, 19 Feb 2022 15:21:29 +0530 Subject: [PATCH] crowbook: link against openssl-1.1 --- packages/crowbook/build.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/crowbook/build.sh b/packages/crowbook/build.sh index 56a328f1b..19be4a852 100644 --- a/packages/crowbook/build.sh +++ b/packages/crowbook/build.sh @@ -3,14 +3,22 @@ TERMUX_PKG_DESCRIPTION="Allows you to write a book in Markdown without worrying TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.15.2e +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/lise-henry/crowbook/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ac950c051faece985821c28c17206188a6211247a040a8e7afaa34a5f45cf81f -TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_DEPENDS="openssl-1.1" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - export OPENSSL_INCLUDE_DIR=$TERMUX_PREFIX/include/openssl - export OPENSSL_LIB_DIR=$TERMUX_PREFIX/lib + # openssl-sys supports OpenSSL 3 in >= 0.9.69 + # We can switch to OpenSSL 3 once new version of crowbook is released + export OPENSSL_INCLUDE_DIR=$TERMUX_PREFIX/include/openssl-1.1 + export OPENSSL_LIB_DIR=$TERMUX_PREFIX/lib/openssl-1.1 + CFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CFLAGS" + CPPFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CPPFLAGS" + CXXFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CXXFLAGS" + LDFLAGS="-L$TERMUX_PREFIX/lib/openssl-1.1 -Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1 $LDFLAGS" + RUSTFLAGS+=" -C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1" } termux_step_make() {