Browse Source

tools: update CMake to 3.17.0

It includes the patch from Hugo to fix the PKG_CONFIG_PATH usage.
pull/104/head
Steve Lhomme 6 years ago
parent
commit
9f33c286cc
  1. 28
      extras/tools/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch
  2. 2
      extras/tools/SHA512SUMS
  3. 2
      extras/tools/bootstrap
  4. 4
      extras/tools/packages.mak
  5. 3
      extras/tools/tools.mak

28
extras/tools/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch

@ -1,28 +0,0 @@
From f92a4b23994fa7516f16fbb5b3c02caa07534b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 2 Dec 2019 16:42:07 +0100
Subject: [PATCH] FindPkgConfig: Fix path manipulations when cross compiling
When cross compiling from a unix machine, if(UNIX) is false,
whih causes the path not to be fixed for unix, leading to false
negative if PKG_CONFIG_PATH needs to be probed
---
Modules/FindPkgConfig.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 5162a44b33..f4b6ea121c 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -337,7 +337,7 @@ macro(_pkg_set_path_internal)
# remove empty values from the list
list(REMOVE_ITEM _pkgconfig_path "")
file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
- if(UNIX)
+ if(CMAKE_HOST_UNIX)
string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
endif()
--
2.19.1.windows.1

2
extras/tools/SHA512SUMS

@ -1,7 +1,7 @@
3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2 apache-ant-1.9.7.tar.bz2
e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee autoconf-2.69.tar.gz
47b0120a59e3e020529a6ce750297d7de1156fd2be38db5d101e50120f11b40c28741ecd5eacf2790a9e25386713dcf7717339cfa5d7943d0dbf47c417383448 automake-1.16.1.tar.gz
b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76 cmake-3.16.2.tar.gz
f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a cmake-3.17.0.tar.gz
9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0 gas-preprocessor-72887b9.tar.gz
3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18 libtool-2.4.6.tar.gz
29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae m4-1.4.18.tar.gz

2
extras/tools/bootstrap

@ -133,7 +133,7 @@ check automake 1.15
check m4 1.4.16
check libtool 2.4
check pkg-config
check cmake 3.16.0
check cmake 3.17.0
check yasm
check_tar
check ragel

4
extras/tools/packages.mak

@ -9,8 +9,8 @@ YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.
NASM_VERSION=2.14
NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
CMAKE_VERSION=3.16.2
CMAKE_URL=http://www.cmake.org/files/v3.16/cmake-$(CMAKE_VERSION).tar.gz
CMAKE_VERSION=3.17.0
CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
LIBTOOL_VERSION=2.4.6
LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz

3
extras/tools/tools.mak

@ -92,12 +92,11 @@ cmake-$(CMAKE_VERSION).tar.gz:
cmake: cmake-$(CMAKE_VERSION).tar.gz
$(UNPACK)
$(APPLY) $(TOOLS)/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch
$(APPLY) $(TOOLS)/cmake-msys-FindPkg.patch
$(MOVE)
.buildcmake: cmake
(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF && $(MAKE) && $(MAKE) install)
(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF && $(MAKE) && $(MAKE) install)
touch $@
CLEAN_FILE += .buildcmake

Loading…
Cancel
Save