diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-07-23 07:10:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 22:10:42 -0700 |
| commit | 8cda3938f5f03a7961cc8024f83829e0f83176d2 (patch) | |
| tree | c140dbf08dad8039f14dced206e7d59e5d2f2f6f | |
| parent | 4b317d797e0fb3ca0cfa1b47f2c6741284fe5f5c (diff) | |
| download | vcpkg-8cda3938f5f03a7961cc8024f83829e0f83176d2.tar.gz vcpkg-8cda3938f5f03a7961cc8024f83829e0f83176d2.zip | |
[tiff] Fix build on arm64-linux (#18511)
* Fix FindCMath
* x-add-version
| -rw-r--r-- | ports/tiff/FindCMath.patch | 13 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/tiff/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tiff.json | 5 |
5 files changed, 21 insertions, 1 deletions
diff --git a/ports/tiff/FindCMath.patch b/ports/tiff/FindCMath.patch new file mode 100644 index 000000000..9158f6fcf --- /dev/null +++ b/ports/tiff/FindCMath.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake +index 2da3b7f..e6d5145 100644 +--- a/cmake/FindCMath.cmake ++++ b/cmake/FindCMath.cmake +@@ -32,7 +32,7 @@ include(CheckLibraryExists) + + check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW) + if(NOT CMath_HAVE_LIBC_POW) +- find_library(CMath_LIBRARY NAMES m) ++ 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}) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 1e36968fe..57b7543b3 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( PATCHES cmakelists.patch fix-pkgconfig.patch + FindCMath.patch ) set(EXTRA_OPTIONS "") diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 494a34957..f31b99cdc 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tiff", "version": "4.3.0", + "port-version": 1, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9f9872ce6..01921d95c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6234,7 +6234,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 8a52bde57..fb7ecc60d 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0", + "version": "4.3.0", + "port-version": 1 + }, + { "git-tree": "e6f91f4785acec97b685989a9c61fa96927cf707", "version": "4.3.0", "port-version": 0 |