Skip to content

Commit

Permalink
Merge pull request #446 from jonnius/click-valhalla-update
Browse files Browse the repository at this point in the history
Update valhalla to 3.4.0 on Ubuntu Touch (click)
  • Loading branch information
rinigus authored Apr 11, 2024
2 parents 8d48504 + 9951547 commit c9a76dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions packaging/click/clickable.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
clickable_minimum_required: 7.12.1
clickable_minimum_required: 8.0.1

scripts:
prepare-deps: git submodule update --recursive --init && ${ROOT}/packaging/click/prepare-deps.sh
Expand Down Expand Up @@ -67,17 +67,19 @@ libraries:

builder: cmake
build_args:
- -DTHREADS_PTHREAD_ARG=0
- -DCMAKE_INSTALL_PREFIX:PATH=/usr
- -DBUILD_SHARED_LIBS=OFF
- -DENABLE_DATA_TOOLS=OFF
- -DENABLE_PYTHON_BINDINGS=OFF
- -DENABLE_NODE_BINDINGS=OFF
- -DENABLE_SERVICES=OFF
- -DENABLE_TESTS=OFF
- -DENABLE_WERROR=OFF
- -DENABLE_SINGLE_FILES_WERROR=OFF

postbuild:
- sed -i 's/boost_filesystem[^ ]*/boost_filesystem/g' \
${INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/pkgconfig/libvalhalla.pc
- cp -r ${SRC_DIR}/third_party/date/include/date ${INSTALL_DIR}/usr/include/

dependencies_host:
- gcc-opt
Expand Down
2 changes: 1 addition & 1 deletion packaging/click/prepare-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ rm -rf "${LIBPOSTAL_SRC_DIR}" "${VALHALLA_SRC_DIR}"

# Download sources
git clone -b 1.0.0 ${CLONE_ARGS} https://github.com/rinigus/pkg-libpostal.git "${LIBPOSTAL_SRC_DIR}"
git clone -b 3.0.9 ${CLONE_ARGS} https://github.com/rinigus/pkg-valhalla-lite.git "${VALHALLA_SRC_DIR}"
git clone -b 3.4.0 ${CLONE_ARGS} https://github.com/rinigus/pkg-valhalla-lite.git "${VALHALLA_SRC_DIR}"

0 comments on commit c9a76dc

Please sign in to comment.