Commit Graph

302 Commits (dev)

Author SHA1 Message Date
Jeff Becker ad882d0d70
initial working code 4 years ago
Jeff Becker 0006751d80
initial wack at lokimq 4 years ago
Jeff Becker a9de1ad277
fix typo 4 years ago
Jeff Becker c66e925fb2
add more cmake incantations for windows cross compile 4 years ago
Jeff Becker fdfdd2a1d2
turn off lto, add patches 4 years ago
Jeff Becker db3d43a513
fix typo 4 years ago
Jeff Becker 26a2f54b0b
set ar and ranlib on openssl cross compile to appease the cmake god 4 years ago
Jason Rhinelander cdd57ac09b fix unbound ssl linking 4 years ago
Thomas Winget 0ecdf60777 static build fixes in cmake stuff
I hate cmake so much.
4 years ago
Linux User e6bcbf47b4
patch libsodium for windows the cmake way 4 years ago
Rick V adf253e800
picflags differ slightly on native vs wow64 builds 4 years ago
Rick V 45890133bc
LIBUV_ROOT override for win32
emit PIC code (.reloc) on win32 for aslr
4 years ago
Jason Rhinelander 83fc7de237 Get processor count properly 4 years ago
Jeff Becker fbb7c0d6f9
add forgotten file 4 years ago
Jeff Becker 6af498092b
exit traffic via loki addresses 4 years ago
Jason Rhinelander a484ccffc2 static curl build fixes
- fix ldap disabling flag
- disable a ton of protocols (include ldap, properly)
- remove INSTALL_COMMAND (the default seems to work fine)
- disable --quiet so we can see the configuration summary
4 years ago
Jason Rhinelander 7d5a99d820
Merge pull request #1284 from majestrate/toggle-lto-2020-05-20
add WITH_LTO option to disble lto on compile time
4 years ago
Jeff Becker a6d17dcd16
add WITH_LTO option to disble lto on compile time 4 years ago
Jason Rhinelander ebd2142114 Don't use std::optional::value() because f u macos
This replaces all use of std::optional's `opt.value()` with `*opt`
because macOS is great and the ghost of Steve Jobs says that actually
supporting std::optional's value() method is not for chumps before macOS
10.14.  So don't use it because Apple is great.

Pretty much all of our use of it actually is done better with operator*
anyway (since operator* doesn't do a check that the optional has a
value).

Also replaced *most* of the `has_value()` calls with direct bool
context, except for one in the config section which looked really
confusing at a glance without a has_value().
4 years ago
Jason Rhinelander be9ddf2ae1 Bring back ghc::filesystem for broke AF macos
macOS doesn't provide `<filesystem>` support when targetting anything
earlier than 10.15.
4 years ago
Jason Rhinelander b4fce0e3ee curl: use ccache; disabled lots of other crap
brotli and libpsl both got autodetected on my system, so explicitly
disable them (and a bunch of other crap from --configure).

Build with ccache.
4 years ago
Jason Rhinelander fa794e64cd Build libsodium with ccache and fPIC
fPIC is needed in case we are building a shared liblokinet (within which
we want the static libsodium).
4 years ago
Jason Rhinelander c5faa86926 cmake refactor
Refactors many things in cmake to improve and simplify:

- don't use variable indirection for target names; target names are
*already* a variable of sorts.  (e.g. ${UTIL_LIB} is now just
lokinet-util).  cmake/basic_definitions.cmake is now gone.

- fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather
than shoving a bunch of flag hacks through link_libraries and
add_compile_options.  This also now enables LTO when building a shared
library (because previously the -flto hacks were only turned on in the
static code for some reason).

- build liblokinet as *either* shared library or static library, but not
both.  Building both makes things more complicated because they had
different names (lokinet-shared or lokinet-static) and seems pointless:
you generally want one or the other.  Now there is just the liblokinet
target, which will be shared or static depending on the value of
BUILD_SHARED_LIBS.

- Simplify lokinet-cryptography AVX2 code: just build *one* library, and
add in the additional AVX2 files when possible, rather than building two
and needing to merge them.

- Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK.
It makes no sense to use one of these (_RUNTIME) on Windows and the
other on non-Windows when they appear to try to do the same thing.

- remove a bunch of annotations from `endif(FOO)` -> `endif()`.

- move all the tuntap compilation code (including OS-specific source
file selection) into vendor/CMakeLists.txt and build tuntap as an
intermediate OBJECT library rather than keeping a global variable in 5
different files.

- move release motto define to root cmake; it made no sense being
duplicated in both unix.cmake and win32.cmake

- fix add_log_tag to not stomp on any existing source compile flags with
its definition.  Also use proper compile definition property instead of
cramming it into compile flags.

- make optimization/linker flags less hacky.  There's no reason for us
to force particular optimization flags because the cmake build type
already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3).  Not doing
that also silences a bunch of cmake warnings because it thinks "-O0 -g3"
etc.  are link libraries (which is reasonable: that's what the code was
telling cmake they are).

- sets the default build type to RelWithDebInfo which gives us `-O2 -g`
if you don't specify a build type.

- Move PIC up (so that the things loaded in unix.cmake, notably libuv,
have it set).

- Add a custom `curl` interface library that carries the correct link
target and include paths for curl (system or bundled).
4 years ago
Jeff Becker 64157d5d44 track libcurl and libuv with cmake, add libuv submodule 4 years ago
Jeff Becker abc1f67430
check for std::optional as macos can be broke af sometimes 4 years ago
Jeff Becker 5a24d2deef
add check for std::filesystem 4 years ago
cathugger 0bb43d98c7
fix GenVersion.cmake
* rev-parse --short without any argument defaults to 8 chars
* truncation is absolutely moot here
* rev-list --abbrev-commit also uses 8 chars by default

because of length mismatch (COMMIT - 9 chars, TAGGEDCOMMIT - 8 chars) it always was mismatching them even when it should've been detecting that it's at release tag.
cut out explicit lengths and leave everything to use defaults, because they work (they both rely on the same core.abbrev setting so no length mismatch should happen).
4 years ago
Jason Rhinelander 1697bf90fe C++17
Compiles with C++17, replaces ghc::filesystem with std::filesystem,
nonstd::optional with std::optional, and llarp::string_view with
std::string_view.
4 years ago
Jeff Becker 783e72da73
fix ci for win32 4 years ago
Stephen Shelton 67f023cf8a
Use install(PROGRAMS... instead of isntall(FILES... 4 years ago
Jason Rhinelander 3048ccf3f8 Set -mmacosx-version-min the cmake way 4 years ago
Jeff edc0d1a3ed
Merge pull request #1225 from majestrate/macos-cpack-setup-and-bootstrap-2020-04-10
macos cpack installer infra
4 years ago
Stephen Shelton 0b1c57f650 Include macos uninstall script 4 years ago
Jason Rhinelander 9f208d2b6c Pass CMAKE_PREFIX_PATH through to lokinet-gui
Needed to build against the right Qt
4 years ago
Rick V 96fc3cdd55
fix pybind 4 years ago
Jason Rhinelander 216b807cb3 Notarize has an "a" in it 4 years ago
Jason Rhinelander 8d74407d11 codesigning and notarization
Codesigns and notarizes the package.  Requires a bunch of stuff to
actually get this working.  (see contrib/macos-signing.txt).

I'm currently also building with

    -DLOKINET_GUI_REPO=https://github.com/jagerman/loki-network-control-panel.git -DLOKINET_GUI_CHECKOUT=cmake

because it needs the camke-ification PR for the control panel to
properly sign everything there.
4 years ago
Jason Rhinelander 0032f1fdde Add simple installer readme 4 years ago
Jason Rhinelander daf0174e53 Change mac install prefix to /opt/lokinet
/usr/local is probably going to get stomped on by homebrew.
4 years ago
Jason Rhinelander 93311fbc99 Build lokinet-gui with ExternalProject
Also installs it without the extra hack by specifying ../../Applications
for the destination.  (This definitely feels kind of nasty, but it works).
4 years ago
Jason Rhinelander 3dd3d48fbb Consolidate cmake vars & definitions
CMake will set version variables itself if you give the version in the
project(), which is cleaner.  Also removes some (nearly) duplicate
definitions and settings added in basic_definitions.cmake for unknown
reasons.

Removes some redundant settings (name, description, version) from the
cpack settings which already default to the values from the project()
call.
4 years ago
Stephen Shelton c20d5b186d Bundle gui in mac installer 4 years ago
Stephen Shelton dd3121d8ac MacOS installer / runtime nonsense 4 years ago
Jeff Becker 31f74b5ffb macos post install script that bootstraps, generates configs and registers plist 4 years ago
Jeff Becker c36b6a409c
move version to cmake so docs can access it 4 years ago
Jeff Becker 3e7acb72e1
more docs, make doxygen work 4 years ago
Jeff Becker 7455a1956d
make apple builds build for older versions and embrace the bitrot 4 years ago
Jeff Becker 9428689939
fix up cpack for macos 4 years ago
Jeff Becker aae260fbea
more macos installer bits 4 years ago
Jeff Becker 3b26b8b24d
make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now. 4 years ago
Jeff Becker 9e696e131e
make installer pull in tuntap driver 4 years ago
Jeff Becker f335aaa847
set license 4 years ago
Jeff Becker 2190da8c81
cpack win32 4 years ago
Jason Rhinelander 3b0927ce13
Merge pull request #1140 from despair86/cmake-cleanup
some light cmake cleanup for win32
4 years ago
Rick V 3ca50b3619
missing branch on option 4 years ago
Rick V d22af469a4
some win32 cmake cleanup
also removes MSVC rules (we don't support MSVC)
4 years ago
Rick V dbc559d4ff
finally fix cross-LTO on windows builds 4 years ago
Rick V 4cd7a22ca3
fix libsodium cross compile 4 years ago
Jeff Becker 0a6c91b26c
operator presidence 4 years ago
Jeff Becker d44a96769a
allow building from source tarballs 4 years ago
despair 8a27e3972d
we need XPG7 on netbsd 4 years ago
Jason Rhinelander 7ab6220a41 Older cmake workaround 4 years ago
Jason Rhinelander 5a4700d868 Use ExternalProject to build downloaded libsodium 4 years ago
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.
4 years ago
Jason Rhinelander b72a4296b7 Fix libsodium 1.0.18 URL 4 years ago
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.
4 years ago
Jeff Becker da5eb913e9
use proper cmake call 4 years ago
Jeff Becker fde0ca374f
i hate curl 4 years ago
Jeff Becker 336a748695
make it build in normal mode too 4 years ago
Jeff Becker 80cbddde7b
fixups for review 4 years ago
Jeff Becker 2ce592e4af
static link with docs 4 years ago
Ryan Tharp 20ce679c3a macos release needs the include path 4 years ago
Ryan Tharp b21b0b49d0 support LIBCURL_ROOT, disable LIBUV includes 4 years ago
Ryan Tharp 6001215a23 bring in all updates from STATIC_RUNTIME 4 years ago
Rick V a62a75d640
nit 4 years ago
Rick V 9fa9209114
don't be aggressive
remove libcurl packaging rules. We still build it, but ship only the curl.exe
4 years ago
Rick V d1b9b89812
add note
add libuv build

add its dependent libraries to the final link line
4 years ago
Rick V 6d49ffd60b
include all platform dependencies transitively 4 years ago
Jeff Becker ab183665ab
freebsd fix 4 years ago
Stephen Shelton 332f33b049 Remove FS_LIB conditionals 4 years ago
Stephen Shelton 5ce260fce1 Use vendored fs::filesystem on all platforms 4 years ago
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).
4 years ago
Jeff Becker abf9544ddc
make libuv on win32 work 4 years ago
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.
5 years ago
Jeff Becker 8bac293dc7
fix patching command 5 years ago
Jeff Becker 01dbd329bd
add forgotten file 5 years ago
Jeff Becker 25c820f166
add compile time override for libsodium tarball url using -DSODIUM_TARBALL_URL=https://whatever/tarball.tar.gz 5 years ago
Rick V c63d0b5be2
add cmake rule to patch libsodium on windows
# Conflicts:
#	crypto/CMakeLists.txt
5 years ago
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).
5 years ago
Jason Rhinelander 57ccb1fd5c Move sodium download into separate cmake include 5 years ago
Rick V 9b9ea6e6d0
make that a universal rule 5 years ago
Rick V b473f17231
lto not supported for cross compile targets 5 years ago
Rick V c00b083be7
grab everything and the kitchen sink at build time instead
will finish testing this once the new release is stable
5 years ago
Rick V b2c23f2c71
a. GCC LTO requires specifiying CXXFLAGS in LDFLAGS
b. not my fault your machine doesn't link pthread properly
5 years ago
Jason Rhinelander 0774213e87 Fix cmake sodium version check 5 years ago
Jeff Becker e0a9059d8c
use PACKAGE_FIND_VERFSION 5 years ago
Jeff Becker 7fbb8e25bb
set version in FindLibsodium.cmake 5 years ago
Jeff Becker f38240f945
devendor libsodium by default except for android 5 years ago
Stephen Shelton 961c8dbddf Prevent in-source-builds with cmake macro 5 years ago
Michael 77b4efd78b
fixup ios 5 years ago
Jeff 8f46a62aa6
Merge pull request #847 from michael-loki/ios_wip
Distinct ios build
5 years ago
Jeff 0aab04d1b2
Merge pull request #843 from michael-loki/fix_static_link
Fix static link with gcc
5 years ago
Michael fadedb4a7b
Distinct ios build 5 years ago
Michael a5858c770f
Fix static link with gcc 5 years ago
Rick V 94e9305d54
fix static build 5 years ago
Jeff 35230adbe5
Merge pull request #833 from majestrate/gut-utp-2019-09-19
remove libutp and all such code related to utp
5 years ago
jeff 1853b28590 remove libutp and all such code related to utp 5 years ago
Michael 6719a1790c
Statically link releases 5 years ago
Rick V 5ecc76a332
if cppbackport is built, make that consistent too 5 years ago
Rick V 89f92d3aed
new cmake module 5 years ago
Rick V 4246caf8a1
add build option for constrained node ops and make sure everything is now target-optimised in all configurations (allows debugging on the target using the debug build config)
link libatomic if we're targeting 486

link libatomic.a if we're targeting windows

idk what the hell MSVC does for -arch:IA32

we already set the c++14 flag early on

strip target selection flags from MSVC builds and clang-cl

c++14 does not propagate to compile tests
5 years ago
Rick V b3a975ff8e
sun fix
fix testing on sun
5 years ago
Jeff e7796a7ba4
Merge pull request #784 from michael-loki/shadow_fixes
Partial fixes for shadow
5 years ago
Michael 7d39f84ef3
Partial fixes for shadow 5 years ago
Rick V 3f6f636bbf
reeeee 5 years ago
Jeff d8e4f5e6fc
Merge pull request #779 from michael-loki/find_libatomic
Find libatomic via cmake magics
5 years ago
Michael e7c48e57e9
Fix on compilers which aren't C++11 by default 5 years ago
Michael 7dfbb41e0d
Find libatomic fix cmake magics 5 years ago
Michael 429284aedc
Fix static linking on macOS 5 years ago
Michael 6e5cab971f
make windows fixes 5 years ago
Michael 16cdfbd5f0
clang-tidy modernize pass 5 years ago
Rick V c5aaefa7e7
this is getting hairy 5 years ago
Rick V 54d4932d74
why isn't cmake picking this up 5 years ago
Rick V 609a9a1c31
fix netbsd 5 years ago
Rick V 3782479276
fix sun 5 years ago
Rick V b7ffe37ffb
add make windows config command line 5 years ago
Michael 614b669fd5
Abandon debian 5 years ago
Michael df498c7bf8
try to make some windows 5 years ago
Jeff Becker 43cb62af16
fix android compile, have makefile pull in libuv for cmake on android 5 years ago
Michael 82958de2d7
Tidy up cmake files 5 years ago
Michael 65af2c4266
Normalise build 5 years ago
Michael 4806e52f62
Try to silence some warnings to reduce noise 5 years ago
Michael 2cc180b6a4
Add FindLibUV and migrate 5 years ago
Michael 2acb163083
Fix llvm 8 build 5 years ago
Michael a2326efa37
Revert "Merge pull request #679 from tewinget/revert-config-refactor"
This reverts commit 2996a7f29c, reversing
changes made to 10df3bd4b3.
5 years ago
Thomas Winget d044d60101 Reverts #678 #677 and #669 with hashes:
10df3bd
766ece8
979f095

See those commits for further details
5 years ago
Michael bd78471dae
Move ini parser as well 5 years ago
Michael 80d1e4aef9
Add in-source version of std::filesystem::permissions 5 years ago
Michael 59e8a7316f
Revert "Merge pull request #668 from michael-loki/remove_cppbackport"
This reverts commit 33142d5005, reversing
changes made to 408a652a01.
5 years ago
Michael 07377b8d5f
Find libuv for Ryan 5 years ago
Michael 1639c58cb6
Remove cppbackport from vendor dir 5 years ago
Jeff Becker c63dbe7e48
fix freebsd build 5 years ago
Jeff Becker e265661adb
try fixing issue number 17 (not done) 5 years ago
Rick V 68862cc830
we libuv now 5 years ago
Rick V 271cfcb64e
remove all disused platform-specific event loops
(cherry picked from commit 94d00a169ba7934ef719cc38fe0ca1eff8e1b675)
5 years ago
Rick V 7788d6ec3c
fix windows
lto stuff remains for now
since native builds work

(cherry picked from commit 37814472af5e7c35d514bae16d19b08050765d52)

i'm not porting the UNIX-tier cppfs thing

(cherry picked from commit d6edbd789534d4fd0bce6c8c2418347cd80bebdb)

none of this had to be specified directly ffs

(cherry picked from commit 5dbefa7131a6fe0b2006c90ecdba7e466fdd1ecc)

stop breaking shit reee

(cherry picked from commit 14be89902ccc75a7fc21863593da393ca976d0d4)
5 years ago
Michael 8c570653ee
Refactor top level cmake file into multiple components 5 years ago
Michael 0b4d787042
More work on router docker image
- Multi-stage docker build (final image only 15MB!)
- Build in release mode
    - Fix bug with release mode
    - Fix compiler being dumb AF
    - Disable FORTIFY for now
- Enable LTO when making a staticly linked release
- Fix some gcc specific warnings
- Refactor cmake stuff into multiple files
5 years ago
Michael 4143472a17
Add cmake module to target a library as 'system', and fix a few warnings 5 years ago
Jeff Becker edc477b071
update build files again 6 years ago
Jeff Becker 812bb6e0c0
update build files 6 years ago
Jeff Becker 63150549fc
start moving to cmake 6 years ago