domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,626 Commits 6 Branches 28 Tags
dcbbac55edbcc97e1ba320149eba886d3ab901b0
Commit Graph

42 Commits

Author SHA1 Message Date
Felix Fietkau
90805b16b6 cmake: fix build error with Xcode 9 on macOS 12 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2017-10-05 21:14:44 +02:00
Jo-Philipp Wich
64da598c8f tools: cmake: fix librt linking (FS#1032) 
Commit 839129b864 "tools/cmake: Update to 3.9.3" improperly rebased the
librt linking patch, causing FS#381 to resurface.

Fixes FS#1032.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2017-10-02 14:00:48 +02:00
Daniel Engberg
839129b864 tools/cmake: Update to 3.9.3 
Update CMake to 3.9.3
Remove FreeBSD patch (not needed)
Rearrage and update patches

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
 2017-09-30 22:41:12 +02:00
Hannu Nyman
1a0d52a733 tools/cmake: update to 3.8.1 
* update cmake to 3.8.1
* refresh patches

Release notes:
https://cmake.org/cmake/help/v3.8/release/3.8.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2017-05-25 19:01:07 +02:00
Etienne Haarsma
0928b6d2ab cmake: update to version 3.7.2 
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
 2017-02-09 14:49:25 +01:00
Alexandru Ardelean
968fa53197 tools/cmake: remove HOST_CONFIGURE_CMD and re-distribute the args & vars 
The final semantic is the same, but this is a bit more correct.

Build tested on Windows 10 (yes, there is some
Ubuntu mode for Windows 10, and I've been also building LEDE
on it for a few weeks).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2017-01-16 20:40:14 +01:00
Felix Fietkau
6f9011f089 cmake: properly pass host cflags/ldflags to the build 
This should hopefully fix build issues where libraries that we ship in
tools/ were accidentally picked up from other places on the system, e.g.
/usr/local

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2017-01-13 10:23:43 +01:00
Felix Fietkau
7969770100 cmake: support verbose build that shows compiler commands 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2017-01-13 10:23:43 +01:00
Felix Fietkau
d6de31310c cmake: restore parallel build support for bootstrap 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2017-01-13 10:23:43 +01:00
Jo-Philipp Wich
43d5339940 tools: cmake: link librt if needed (FS#381) 
Patch cmakes cmcurl component to unconditionally link librt when we discover
a clock_gettime() symbol in -lrt.

This is required to sucessfully link LibreSSL's libcrypto which might or
might not reqauire librt.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2017-01-11 03:48:30 +01:00
Jo-Philipp Wich
08d73bfdce tools: cmake: use different approach for passing LDFLAGS 
Funnel the required LDFLAGS environment through HOST_CONFIGURE_CMD for now
as the HOST_CONFIGURE_VARS semantics are completely broken.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2017-01-05 14:34:11 +01:00
Jo-Philipp Wich
f9b253147a tools: cmake: use pkg-config to discover libcrypto linker flags 
LibreSSL's libcrypto.so has an indirect dependency to librt for clock_gettime()
on Linux.

Use pkg-config to portably discover the required linker flags.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2017-01-05 14:21:27 +01:00
Felix Fietkau
8160beb014 cmake: update to version 3.7.1 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2017-01-05 13:45:55 +01:00
Felix Fietkau
720b99215d treewide: clean up download hashes 
Replace *MD5SUM with *HASH, replace MD5 hashes with SHA256

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2016-12-16 22:39:22 +01:00
Jo-Philipp Wich
0b3b8c83c0 tools: cmake: fix compatibility with LibreSSL as well 
Sadly, LibreSSL claims to be OpenSSL v2.0.0 while not providing the new
interfaces introduced with OpenSSL v1.1.x, so extend the pre-OpenSSL 1.1.x
compat checks to consider LibreSSL as well.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2016-12-01 16:49:24 +01:00
Jo-Philipp Wich
83697ec389 tools: cmake: import another upstream commit for OpenSSL backwards compatibility 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2016-12-01 15:41:40 +01:00
Jo-Philipp Wich
7abd011b0a tools: cmake: import upstream patch for OpenSSL 1.1.x compatibility 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2016-12-01 15:02:00 +01:00
Hannu Nyman
2c05fd7ef4 tools/cmake: update to 3.7.0 
Release notes at
https://cmake.org/cmake/help/v3.7/release/3.7.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2016-11-26 21:59:40 +01:00
Hannu Nyman
a247e26a7e tools/cmake: update to 3.6.1 
Update cmake to 3.6.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2016-08-15 15:32:37 +02:00
Matthias Schiffer
96db107524 tools/cmake: fix parallel build with Make 4.2+ 
Avoid using the --parallel argument to the CMake bootstrap, as that doesn't
allow us to remove the -j argument. Instead, pass the HOST_JOBS arguments
in MAKEFLAGS.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 2016-06-15 19:26:17 +02:00
Syrone Wong
f8abb68e3a tools/cmake: bump to 3.5.2 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-05-13 17:03:54 +02:00
Hauke Mehrtens
5a5657cda1 tools/cmake: update to 3.5.1 
Update cmake to 3.5.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 49186
 2016-04-17 12:52:37 +00:00
John Crispin
63dc46aa3a tools/cmake: fix compile on Alpine Linux 
internal jsoncpp include order leads to multiple build
errors on Alpine Linux which uses musl libc

use include order from upstream jsoncpp

first error was:
In file included from /usr/include/c++/5.3.0/stdexcept:38:0,
                 from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/include/json/assertions.h:16,
                 from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp:7:
/usr/include/c++/5.3.0/exception:35:9: error: '#pragma' is not allowed here
 #pragma GCC visibility push(default)

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

SVN-Revision: 48995
 2016-03-10 19:12:15 +00:00
John Crispin
4cb155bded tools/cmake: update to 3.4.3 
Update cmake to 3.4.3.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 48659
 2016-02-08 08:25:39 +00:00
Felix Fietkau
01e9b74e73 tools/cmake: update version to 3.4.1 
Update cmake version to 3.4.1, released in Dec 2015.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 48188
 2016-01-10 17:19:40 +00:00
John Crispin
9ffd80fef5 tools/cmake: update to 3.4.0 
Update cmake to 3.4.0.
Refresh patches.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 47568
 2015-11-21 21:26:02 +00:00
Felix Fietkau
35cc181eb2 tools/cmake: update to 3.3.2 
Update cmake to 3.3.2 and refresh patches.
Add a secondary download location.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 47327
 2015-10-31 09:31:06 +00:00
Jo-Philipp Wich
e1c95ffb93 tools: Fix cmake build on FreeBSD 10.1 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44281
 2015-02-05 16:58:24 +00:00
Luka Perkov
0f2ff3ba97 cmake: upgrade to 2.8.12.2 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39598
 2014-02-16 21:51:10 +00:00
Luka Perkov
e8f2d46bdb cmake: upgrade to 2.8.12.1 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38899
 2013-11-24 07:10:21 +00:00
Luka Perkov
11c7e45e8d cmake: upgrade to 2.8.12 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38457
 2013-10-18 23:38:26 +00:00
Felix Fietkau
f39f07cd09 tools/cmake: disable qt related checks to fix build issues 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37917
 2013-09-07 18:33:07 +00:00
Luka Perkov
ef876c20db cmake: upgrade to 2.8.11.2 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37794
 2013-08-16 00:19:17 +00:00
Luka Perkov
829e0bc8b3 cmake: upgrade to version 2.8.10.2 
SVN-Revision: 35826
 2013-02-28 00:52:33 +00:00
Felix Fietkau
15911e5a84 cmake: update to version 2.8.9 
SVN-Revision: 33576
 2012-09-28 00:07:28 +00:00
Felix Fietkau
ed2bf29be5 build: add the + token to any commands that can pass through the jobserver, fixes parallel build on some systems 
SVN-Revision: 33523
 2012-09-23 09:50:01 +00:00
Felix Fietkau
a2cf331ba6 tools/cmake: enable parallel builds 
SVN-Revision: 33441
 2012-09-15 14:18:10 +00:00
Jo-Philipp Wich
65d6a44baa Revert "[tools] cmake: link statically" 
Static linking of cmake is broken on x86_64, until we can sort it out, revert the static linking.

SVN-Revision: 33118
 2012-08-10 21:25:45 +00:00
Jo-Philipp Wich
ecc3d83717 cmake: link statically 
SVN-Revision: 33114
 2012-08-10 19:27:04 +00:00
Florian Fainelli
7d91de232d cmake: update to 2.8.7 
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>

SVN-Revision: 31168
 2012-04-02 16:25:14 +00:00
Alexandros C. Couloumbis
59b085ff1b tools/cmake: update to version 2.8.4 
SVN-Revision: 26283
 2011-03-24 11:27:07 +00:00
Felix Fietkau
0756895047 add tools/cmake 
SVN-Revision: 25264
 2011-01-31 20:15:57 +00:00