[tiff] Fix libm as dependency for android (#25159)

This commit is contained in:
Matthias Kuhn 2022-06-10 19:38:30 +02:00 committed by GitHub
parent 9b8ec3ef37
commit 233e6daf1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 3 deletions

View File

@ -0,0 +1,14 @@
diff --color -Naur v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake
--- v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake 2022-06-09 13:28:09.894347027 +0200
+++ v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake 2022-06-09 13:29:36.220230025 +0200
@@ -31,8 +31,9 @@
include(CheckLibraryExists)
check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW)
+find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
+
if(NOT CMath_HAVE_LIBC_POW)
- find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY})

View File

@ -7,8 +7,10 @@ vcpkg_from_gitlab(
REF v${LIBTIFF_VERSION}
SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7
HEAD_REF master
PATCHES cmakelists.patch
FindCMath.patch
PATCHES
cmakelists.patch
FindCMath.patch
android-libm.patch
)
set(EXTRA_OPTIONS "")

View File

@ -1,6 +1,7 @@
{
"name": "tiff",
"version": "4.4.0",
"port-version": 1,
"description": "A library that supports the manipulation of TIFF image files",
"homepage": "https://libtiff.gitlab.io/libtiff/",
"license": null,

View File

@ -7002,7 +7002,7 @@
},
"tiff": {
"baseline": "4.4.0",
"port-version": 0
"port-version": 1
},
"tinkerforge": {
"baseline": "2.1.25",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d5e9083d0072a4370b44f434cd4dac7b3bee7bc",
"version": "4.4.0",
"port-version": 1
},
{
"git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6",
"version": "4.4.0",