-
Notifications
You must be signed in to change notification settings - Fork 574
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [Valhalla] Bump v3.5.0 * Bump gcc to v8 * Bump boost * bump to 3.5.1 * try same gcc as protoc * Update build_tarballs.jl * try reenabling hostbuild protoc * fix protoc paths and vars * add protoc exec patch * Bump geos * add lz4 vars * try gcc for all platforms * try newer gcc * use clang for Mac * i686 seems to build with gcc toolchain specified? * bash fix * force armv7l to use gcc * try macOS 10.14 * try newer apple sdk * add lz4.pc patch for FreeBSD compatibility and remove unused CMake flags * Bump Mac to 11.3 * tweak protoc patch * revert * fix patch * try even more modern mac... * try forcing cxx 17 * refine * use gcc for mac * Fix Mac Version * Mac use v11.1 * bump mac sdk * try to fix Mac errors... * tweak Mac build * pin protoc * drop compat from hostbuilddependency * switch back to clang... * Fix cxx standard flag * tweak Mac cmake * fix mac * ensure correct vars are set * add protoclite * Update protoc-find-exec.patch * add debug statement * try using newer cmake * drop cmake * web ui is the worst * add prefix for all * try building on windows * lz.pc for mingw * Enable tools * add ExecutableProduct valhalla_service * Activate build features * Turn off http server * add gdal vars * add missing dependency sqlite_jll * add libspatialite * tweak openssl import * bump libspatial dependency * add luajit * drop data tools * try to get to build... * try setting cxx standard * try cxx flag * add cxxflags * [Valhalla] Add compat bounds for LibCURL * add riscv patch for cxx20 warnings * add arm fix * fix patch typo * Drop excess flags (?) * turn off gdal * specify cxx17 * drop comment to trigger build * add tweak * Bump OpenSSL * revert devcontainer.json * make relative to prefix * retriever build * rerun * try specifying compat for both protoc * use packagespec * tweak packagespec * retrigger build * retrigger build * drop excess param --------- Co-authored-by: Mosè Giordano <[email protected]>
- Loading branch information
1 parent
9e4a245
commit 0ea71ef
Showing
4 changed files
with
135 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
V/Valhalla/bundled/patches/fix-template-id-cdtor-error.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| diff --git a/valhalla/midgard/vector2.h b/valhalla/midgard/vector2.h | ||
| index 37d88effc..f6e0a1dc7 100644 | ||
| --- a/valhalla/midgard/vector2.h | ||
| +++ b/valhalla/midgard/vector2.h | ||
| @@ -19,7 +19,7 @@ public: | ||
| /** | ||
| * Default constructor | ||
| */ | ||
| - VectorXY<PrecisionT>() : x_(0.0), y_(0.0) { | ||
| + VectorXY() : x_(0.0), y_(0.0) { | ||
| } | ||
|
|
||
| /** | ||
| @@ -27,7 +27,7 @@ public: | ||
| * origin to the point. | ||
| * @param p Point. | ||
| */ | ||
| - VectorXY<PrecisionT>(const PointXY<PrecisionT>& p) : x_(p.x()), y_(p.y()) { | ||
| + VectorXY(const PointXY<PrecisionT>& p) : x_(p.x()), y_(p.y()) { | ||
| } | ||
|
|
||
| /** | ||
| @@ -35,7 +35,7 @@ public: | ||
| * @param x x component of the vector. | ||
| * @param y y component of the vector. | ||
| */ | ||
| - VectorXY<PrecisionT>(const PrecisionT x, const PrecisionT y) : x_(x), y_(y) { | ||
| + VectorXY(const PrecisionT x, const PrecisionT y) : x_(x), y_(y) { | ||
| } | ||
|
|
||
| /** | ||
| @@ -43,7 +43,7 @@ public: | ||
| * @param from Point at origin of the vector. | ||
| * @param to Point at end of vector | ||
| */ | ||
| - VectorXY<PrecisionT>(const PointXY<PrecisionT>& from, const PointXY<PrecisionT>& to) | ||
| + VectorXY(const PointXY<PrecisionT>& from, const PointXY<PrecisionT>& to) | ||
| : x_(to.x() - from.x()), y_(to.y() - from.y()) { | ||
| } | ||
|
|
||
| @@ -51,7 +51,7 @@ public: | ||
| * Copy constructor. | ||
| * @param w Vector to copy to the new vector. | ||
| */ | ||
| - VectorXY<PrecisionT>(const VectorXY<PrecisionT>& w) : x_(w.x()), y_(w.y()) { | ||
| + VectorXY(const VectorXY<PrecisionT>& w) : x_(w.x()), y_(w.y()) { | ||
| } | ||
|
|
||
| /** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| prefix=${pcfiledir}/../.. | ||
| exec_prefix=${pcfiledir}/../.. | ||
| libdir=${prefix}/lib | ||
| includedir=${prefix}/include | ||
|
|
||
| Name: lz4 | ||
| Description: LZ4 compression library | ||
| Version: ygg | ||
| Libs: -L${libdir} -llz4 | ||
| Cflags: -I${includedir} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 3af4452a7..e3c46be57 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -175,7 +175,14 @@ endif() | ||
| # for protoc location in a platform agnostic manner | ||
| # newer protobuf versions require a compat bool | ||
| set(protobuf_MODULE_COMPATIBLE ON CACHE BOOL "") | ||
| -find_package(Protobuf REQUIRED) | ||
| +find_package(Protobuf CONFIG REQUIRED) | ||
| + | ||
| +if(Protobuf_PROTOC_EXECUTABLE) | ||
| + set_target_properties(protobuf::protoc PROPERTIES | ||
| + IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" | ||
| + ) | ||
| +endif() | ||
| + | ||
| # and turn it off again | ||
| message(STATUS "Using protoc from ${Protobuf_PROTOC_EXECUTABLE}") | ||
| message(STATUS "Using pbf headers from ${Protobuf_INCLUDE_DIRS}") |