diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-02 01:41:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 10:41:01 -0700 |
| commit | fecd9f144977ec6d327e334bb67d54c44e992741 (patch) | |
| tree | 2e3ca2725040621f4c7d52510365f86ba5e9d8aa | |
| parent | c02feb90c2e321ec0cc99e5651c4fa9827dcdf1c (diff) | |
| download | vcpkg-fecd9f144977ec6d327e334bb67d54c44e992741.tar.gz vcpkg-fecd9f144977ec6d327e334bb67d54c44e992741.zip | |
[ceres] Fix static library path on Linux (#15362)
* [ceres] Fix static library path on Linux
* [ceres] Bump version
* update version record
| -rw-r--r-- | ports/ceres/0004_fix_lib_path_linux.patch | 13 | ||||
| -rw-r--r-- | ports/ceres/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/ceres/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/ceres.json | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/ports/ceres/0004_fix_lib_path_linux.patch b/ports/ceres/0004_fix_lib_path_linux.patch new file mode 100644 index 000000000..e2c9c56b4 --- /dev/null +++ b/ports/ceres/0004_fix_lib_path_linux.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f24ce30..8e5759b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -192,7 +192,7 @@ endif()
+ # install native libraries to lib64 rather than lib. Most distros seem to
+ # follow this convention with a couple notable exceptions (Debian-based and
+ # Arch-based distros) which we try to detect here.
+-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND
++if (0 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+ NOT DEFINED LIB_SUFFIX AND
+ NOT CMAKE_CROSSCOMPILING AND
+ CMAKE_SIZEOF_VOID_P EQUAL "8" AND
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 6b67a7797..78fff33b6 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 0001_cmakelists_fixes.patch 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch + 0004_fix_lib_path_linux.patch find-package-required.patch ) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 55e5b30e1..927a150a2 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ceres", "version-semver": "2.0.0", - "port-version": 3, + "port-version": 4, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1091abbad..2cdf05538 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1138,7 +1138,7 @@ }, "ceres": { "baseline": "2.0.0", - "port-version": 3 + "port-version": 4 }, "cfitsio": { "baseline": "3.49", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 0ea9c26c4..c4607a3ae 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ba834e4ef32213f516d2b0539240ba4cc4a9c90a", + "version-semver": "2.0.0", + "port-version": 4 + }, + { "git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8", "version-semver": "2.0.0", "port-version": 3 |