1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 02:29:28 +02:00
Commit graph

15 commits

Author SHA1 Message Date
Floris Bruynooghe
9376407564 Fix usage of netpgp fallback libs
We can not use cc.has_header() when using a fallback, but we know
the fallback so can just set things correctly for it.

fixes #350
2018-10-09 16:38:25 -07:00
Lars-Magnus Skog
9c7d1bb112
Neppgp ssl mac (#347)
* Do not set HAVE_*_H defines for disabled features

It seems the mac build fails if we set the defines like this so
let's try avoiding including the header file alltogether.  I didn't
expect ssl to look at that define but there you go.

Maybe fixes #337

* Try to silence a few more warnings

Spotted on mac:
435493605

* Do not set HAVE_*_H defines for disabled features

It seems the mac build fails if we set the defines like this so
let's try avoiding including the header file alltogether.  I didn't
expect ssl to look at that define but there you go.

Maybe fixes #337

* Try to silence a few more warnings

Spotted on mac:
435493605

* booleans, how do they work
2018-10-06 17:41:54 +02:00
Floris Bruynooghe
e897b4e771 Restore the includes to use their orignal paths
Further undoing some changes I did.
2018-09-26 14:00:43 -05:00
Floris Bruynooghe
cf756214cf Do not break current android build
The config-netpgp.h file in this repo is directly used by
delta-android, so we should not delete it.  Instead we add a way
for the meson build to use it's own config.h file.
2018-09-26 13:55:07 -05:00
Floris Bruynooghe
951d8f584f Use features for openssl-camellia and openssl-idea
These actually switch on and off code, as opposed to the other HAVE
detction macros which only switch off header includes (and maybe
things would break if they're not there, but that's an existing bug
in netpgp).  So we want to be sure that they are present when we
need them.  This is what features are for.

This configures these features in delta-core as well.
2018-09-26 12:34:53 -05:00
Floris Bruynooghe
1621ec4791 Apparently delta-core does use camellia
Also swithc to the static-pic-lib scheme.  The build_target() call
still does not work transparently for --default_library=both in case
of not a subproject, so there's not much to gain from it.  Basically
meson does not support building monolith libraries very easily (no
one does afaik).
2018-09-25 17:41:16 -05:00
Floris Bruynooghe
0ccd2cfaa4 How does merging even work 2018-09-25 16:59:48 -05:00
Floris Bruynooghe
8d57171424 Merge branch 'master' into bzip 2018-09-25 16:58:17 -05:00
Floris Bruynooghe
e1a98e1f29 Correctly propagate dependencies
This doesn't really matter since all these dependencies are already
dependencies of deltachat directly, but that's not necessarily the
case.
2018-09-25 16:53:24 -05:00
Floris Bruynooghe
04dffc5a77 Update netpgp build scripts
These now do all the dection rather than hardcoding things.  It
also removes the dependency of bzip2 for the delta-core build,
bzip2 is now a feature and delta-core disables it.
2018-09-25 16:43:10 -05:00
Angelo Fuchs
390f486e6e remove requirement for bzip2 closes #301 2018-09-24 12:28:50 +02:00
Floris Bruynooghe
80e7a4ca6b Build all the bundled libraries when appropriate
This can now create a few things:

- Build a shared lib linked against system libs
- Build a static lib linked against system libs
- Build a shared "fat" lib using internal deps
- Build a static lib using interal deps

The readme needs updating.
2018-09-17 14:34:43 +02:00
Floris Bruynooghe
702b3ccc49 Use bundeled libetpan by default
Using the system-libetpan causes pain to people who have out-dated
library versions, additionally it is nice to by default create a
library which uses dependencies as close as possible to the android
version for testing purposes.  This makes sure that the bundeled
sub-projects are used by default.

Additionally it makes sure to not install these bundeled dependencies
and only statically link the libdeltachat.so against them.  This is
beneficial to not conflict with any system-installed versions of these
libraries, especially since some bundled libraries are stripped down
and would not provide indirect users of the library the full library
functionality.

It does still provide an option to use the system-provided libetpan if
desired however, this makes sure libdeltachat plays nice with normal
package managers etc.
2018-06-10 19:52:54 +02:00
Floris Bruynooghe
8d59e5b701 Make libbz2 a proper dependency
This makes sure that at meson/configure time the build will fail
with an error saying the library can't be found.  This is much
better then a mysterious link error right at the end of the
compilation.
2018-01-02 14:47:31 +01:00
Floris Bruynooghe
e8180dda9a Add very basic meson build infrastructure
This manages to build the .so and test binary on Debian stretch.
2017-12-29 13:38:39 +01:00