fix(main/libccd): do not hardcode path to libm

And also build out of source and use " instead of '.
This commit is contained in:
Henrik Grimler 2022-09-24 21:28:02 +02:00
parent 05bd6ef882
commit 6824258708
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 18 additions and 5 deletions

View File

@ -5,17 +5,17 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_LICENSE_FILE="BSD-LICENSE"
TERMUX_PKG_MAINTAINER="Pooya Moradi <pvonmoradi@gmail.com>"
TERMUX_PKG_VERSION="2.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="https://github.com/danfis/libccd/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=542b6c47f522d581fbf39e51df32c7d1256ac0c626e7c2b41f1040d4b9d50d1e
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" # As of 2022-09-01T00:37:36 no github releases are available.
TERMUX_PKG_EXTRA_CONFIGURE_ARGS='
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DBUILD_DOCUMENTATION=ON
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=OFF
-DCMAKE_BUILD_TYPE=Release
'
"
termux_step_pre_configure() {
# Use double-precision for 64-bit archs, otherwise use single-precision
@ -30,6 +30,4 @@ termux_step_pre_configure() {
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=' -DENABLE_DOUBLE_PRECISION=OFF'
;;
esac
# Add path of system 'libm' library to cmake
export CMAKE_LIBRARY_PATH+="$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL"
}

View File

@ -0,0 +1,15 @@
--- ./src/CMakeLists.txt.orig 2022-09-24 19:21:35.591929038 +0000
+++ ./src/CMakeLists.txt 2022-09-24 19:21:54.019880966 +0000
@@ -49,11 +49,7 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
if(NOT WIN32)
- find_library(LIBM_LIBRARY NAMES m)
- if(NOT LIBM_LIBRARY)
- message(FATAL_ERROR "Could NOT find required library LibM")
- endif()
- target_link_libraries(ccd "${LIBM_LIBRARY}")
+ target_link_libraries(ccd m)
if(BUILD_SHARED_LIBS)
set(CCD_PKGCONFIG_EXTRA_LIBS -lm PARENT_SCOPE)
endif()