mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
[tiff] Fix libm as dependency for android (#25159)
This commit is contained in:
parent
9b8ec3ef37
commit
233e6daf1d
14
ports/tiff/android-libm.patch
Normal file
14
ports/tiff/android-libm.patch
Normal 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})
|
@ -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 "")
|
||||
|
@ -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,
|
||||
|
@ -7002,7 +7002,7 @@
|
||||
},
|
||||
"tiff": {
|
||||
"baseline": "4.4.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"tinkerforge": {
|
||||
"baseline": "2.1.25",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7d5e9083d0072a4370b44f434cd4dac7b3bee7bc",
|
||||
"version": "4.4.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6",
|
||||
"version": "4.4.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user