Commit Graph

100 Commits

Author SHA1 Message Date
Jeff Becker
2190da8c81
cpack win32 2020-04-02 11:08:07 -04:00
Jason Rhinelander
3b0927ce13
Merge pull request #1140 from despair86/cmake-cleanup
some light cmake cleanup for win32
2020-03-04 11:44:10 -04:00
Rick V
3ca50b3619
missing branch on option 2020-03-03 15:33:12 -06:00
Rick V
d22af469a4
some win32 cmake cleanup
also removes MSVC rules (we don't support MSVC)
2020-03-03 15:33:11 -06:00
Rick V
dbc559d4ff
finally fix cross-LTO on windows builds 2020-03-03 15:33:10 -06:00
Rick V
4cd7a22ca3
fix libsodium cross compile 2020-03-03 15:33:04 -06:00
Jeff Becker
0a6c91b26c
operator presidence 2020-03-03 06:54:21 -05:00
Jeff Becker
d44a96769a
allow building from source tarballs 2020-03-03 06:54:21 -05:00
despair
8a27e3972d
we need XPG7 on netbsd 2020-02-25 15:48:53 -06:00
Jason Rhinelander
7ab6220a41 Older cmake workaround 2020-02-06 17:13:57 -04:00
Jason Rhinelander
5a4700d868 Use ExternalProject to build downloaded libsodium 2020-02-06 16:27:51 -04:00
Jason Rhinelander
73239f4c39 Use glob to find sodium source files
Manually changing the list every time we want to change the libsodium
version is painful.

I tested this glob against libsodium 1.0.17 and verified it produces the
same set of files (aside from the generated version.h), and that in
1.0.18 it produces the same set modulo upstream files removed/added.
2020-02-02 22:12:29 -04:00
Jason Rhinelander
b72a4296b7 Fix libsodium 1.0.18 URL 2020-02-02 21:37:09 -04:00
Jason Rhinelander
2b93ccb393 Bump libsodium required version to 1.0.18
We use crypto_core_ed25519_scalar_mul which is only exported by
libsodium >= 1.0.18.
2020-02-02 16:38:48 -04:00
Jeff Becker
da5eb913e9
use proper cmake call 2020-01-07 18:14:26 -05:00
Jeff Becker
fde0ca374f
i hate curl 2020-01-07 18:14:25 -05:00
Jeff Becker
336a748695
make it build in normal mode too 2020-01-07 18:14:25 -05:00
Jeff Becker
80cbddde7b
fixups for review 2020-01-07 18:14:25 -05:00
Jeff Becker
2ce592e4af
static link with docs 2020-01-07 18:14:25 -05:00
Ryan Tharp
20ce679c3a macos release needs the include path 2019-12-23 07:15:51 +00:00
Ryan Tharp
b21b0b49d0 support LIBCURL_ROOT, disable LIBUV includes 2019-12-23 06:55:02 +00:00
Ryan Tharp
6001215a23 bring in all updates from STATIC_RUNTIME 2019-12-23 06:55:02 +00:00
Rick V
a62a75d640
nit 2019-12-16 12:11:07 -06:00
Rick V
9fa9209114
don't be aggressive
remove libcurl packaging rules. We still build it, but ship only the curl.exe
2019-12-16 11:28:47 -06:00
Rick V
d1b9b89812
add note
add libuv build

add its dependent libraries to the final link line
2019-12-16 11:28:46 -06:00
Rick V
6d49ffd60b
include all platform dependencies transitively 2019-12-16 11:28:46 -06:00
Jeff Becker
ab183665ab
freebsd fix 2019-12-16 09:02:39 -05:00
Stephen Shelton
332f33b049 Remove FS_LIB conditionals 2019-12-12 12:58:46 -07:00
Stephen Shelton
5ce260fce1 Use vendored fs::filesystem on all platforms 2019-12-12 12:29:03 -07:00
Jason Rhinelander
638fb25b47 Put version info into a compiled file
This rewrites the version info using lokid's approach of compiling it
into a .cpp file that gets generated as part of the build (*not* during
the configure stage).

Among other things, this means that changing the version no longer
invalidates ccache or cmake dependencies, and because it depends on
`.git/index` git commits will cause the version to be regenerated,
making the commit tag more reliable (currently if you rebuild without
running cmake your git commit tag doesn't update).
2019-12-11 22:40:07 -04:00
Jeff Becker
abf9544ddc
make libuv on win32 work 2019-12-11 16:05:40 -05:00
Jason Rhinelander
8d2c22fc72 Replace cppbackport with ghc-filesystem
From https://github.com/gulrak/filesystem which is more up-to-date and
looks better maintained than cppbackport.
2019-12-06 20:41:22 -04:00
Jeff Becker
8bac293dc7
fix patching command 2019-11-05 08:09:17 -05:00
Jeff Becker
01dbd329bd
add forgotten file 2019-11-05 06:52:40 -05:00
Jeff Becker
25c820f166
add compile time override for libsodium tarball url using -DSODIUM_TARBALL_URL=https://whatever/tarball.tar.gz 2019-11-01 11:05:09 -04:00
Rick V
c63d0b5be2
add cmake rule to patch libsodium on windows
# Conflicts:
#	crypto/CMakeLists.txt
2019-10-31 17:08:34 -05:00
Jason Rhinelander
ac3cd441ac Fix download hash verification & version string
Fix hash verification in downloaded libsodium package.

Fix @VERSION@ expansion in sodium/version.h (but don't set it globally
because VERSION is far too generic a variable to be leaving set).
2019-10-31 18:01:36 -03:00
Jason Rhinelander
57ccb1fd5c Move sodium download into separate cmake include 2019-10-31 17:49:08 -03:00
Rick V
9b9ea6e6d0
make that a universal rule 2019-10-30 18:02:32 -05:00
Rick V
b473f17231
lto not supported for cross compile targets 2019-10-30 18:02:30 -05:00
Rick V
c00b083be7
grab everything and the kitchen sink at build time instead
will finish testing this once the new release is stable
2019-10-30 18:02:29 -05:00
Rick V
b2c23f2c71
a. GCC LTO requires specifiying CXXFLAGS in LDFLAGS
b. not my fault your machine doesn't link pthread properly
2019-10-30 18:02:29 -05:00
Jason Rhinelander
0774213e87 Fix cmake sodium version check 2019-10-30 13:25:23 -03:00
Jeff Becker
e0a9059d8c
use PACKAGE_FIND_VERFSION 2019-10-29 13:42:34 -04:00
Jeff Becker
7fbb8e25bb
set version in FindLibsodium.cmake 2019-10-29 13:14:29 -04:00
Jeff Becker
f38240f945
devendor libsodium by default except for android 2019-10-29 12:01:58 -04:00
Stephen Shelton
961c8dbddf Prevent in-source-builds with cmake macro 2019-10-24 13:21:45 -06:00
Michael
77b4efd78b
fixup ios 2019-10-07 00:52:04 +01:00
Jeff
8f46a62aa6
Merge pull request #847 from michael-loki/ios_wip
Distinct ios build
2019-09-30 15:00:17 -04:00
Jeff
0aab04d1b2
Merge pull request #843 from michael-loki/fix_static_link
Fix static link with gcc
2019-09-30 07:54:30 -04:00