diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2018-09-16 13:55:18 -0700 |
|---|---|---|
| committer | Joseph Herlant <herlantj@gmail.com> | 2018-09-16 13:55:18 -0700 |
| commit | 2f4d21c7ddc31f337e4981afbe1dec49fb1687c6 (patch) | |
| tree | a92ed4b13182a1325fa5e712ccfcf7724c58c8d4 | |
| parent | 935c3fbeab6c0b282b45e3f85f60eff50084ff79 (diff) | |
| download | navit-2f4d21c7ddc31f337e4981afbe1dec49fb1687c6.tar.gz | |
progress backup
| -rwxr-xr-x | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | scripts/setup_wince.sh | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b207fe18a..1d8fa5d51 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,15 +261,22 @@ if (Glib_FOUND) include_directories(${Glib_INCLUDE_DIRS}) list(APPEND NAVIT_LIBS ${Glib_LIBRARIES}) else(Glib_FOUND) - set(EXTERNAL_GLIB_VERSION 2.58) + set(EXTERNAL_GLIB_SORT_VERSION 2.58) + set(EXTERNAL_GLIB_TAG 2.58.0) ExternalProject_Add(project_glib - URL https://ftp.gnome.org/pub/gnome/sources/glib/${EXTERNAL_GLIB_VERSION}/glib-${EXTERNAL_GLIB_VERSION}.0.tar.xz - URL_HASH ALGO=SHA256 https://ftp.gnome.org/pub/gnome/sources/glib/${EXTERNAL_GLIB_VERSION}/glib-${EXTERNAL_GLIB_VERSION}.0.sha256sum - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glib-${EXTERNAL_GLIB_VERSION} + URL http://download.gnome.org/sources/glib/${EXTERNAL_GLIB_SORT_VERSION}/glib-${EXTERNAL_GLIB_TAG}.tar.xz + URL_HASH SHA256=c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6 + # Pulling from the repo forces us to use autogen and autoreconf + # URL https://gitlab.gnome.org/GNOME/glib/-/archive/${EXTERNAL_GLIB_TAG}/glib-${EXTERNAL_GLIB_TAG}.tar.gz + # URL_HASH SHA256=e1b8e10da740da41260e5178346d57f4a5458d6bf300af91cdf4edee76d3437e + # git is to old on the wince image to be used here :( + # GIT_REPOSITORY https://gitlab.gnome.org/GNOME/glib.git + # GIT_TAG ${EXTERNAL_GLIB_TAG} + PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glib-${EXTERNAL_GLIB_TAG} CONFIGURE_COMMAND "./configure" BUILD_COMMAND make INSTALL_COMMAND make install - PREFIX=${CMAKE_CURRENT_BINARY_DIR}/glib-${EXTERNAL_GLIB_VERSION} + PREFIX=${CMAKE_CURRENT_BINARY_DIR}/glib-${EXTERNAL_GLIB_TAG} ) ExternalProject_Get_Property(project_glib install_dir) add_library(glib STATIC IMPORTED) diff --git a/scripts/setup_wince.sh b/scripts/setup_wince.sh index ee971b6a7..fb0c2cfd0 100644 --- a/scripts/setup_wince.sh +++ b/scripts/setup_wince.sh @@ -3,4 +3,4 @@ set -e mkdir -p /var/lib/apt/lists/partial apt-get update -apt-get install -y git-core xsltproc coreutils xz-utils +apt-get install -y git-core xsltproc |