| Age | Commit message (Collapse) | Author |
|---|
|
Starting with Xcode 10, system headers are located inside the
macOS SDK.
Add this location to the check for command line tools.
Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
|
|
That qmake -query was added for debugging a long time ago.
Since the comment clearly indicate that the edit of the Makefile is only
for Travis, let's only do it when running on Travis.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
It wasn't documented in the first place (magic first argument, anyone?).
This used to be available for quite a few of the dependency and had
somehow kept around only for Grantlee and Googlemaps. Let's just kill
this and be consistent for all dependencies.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
In some Mac environments autotools somehow think that we have clock_gettime(),
even though it isn't supported. Somehow the previous workaround stopped working
as make ended up re-running ../configure and overwriting our change. This tries
to work around that problem.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This should never be wrong, and should avoid the warnings on Travis.
Fixes #1654
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
And improve the message if we do indeed not find it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This also switches us to libzip's new official home on GitHub, and takes into
account that libzip no longer supports autotools and instead now is cmake
based.
Building against that, on my Mac build system, Subsurface once again correctly
opens DLD files downloaded from divelogs.de.
Fixes #1534
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
So far we did a rather odd mix by default.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Doing that confuses the build setup and as a result the library isn't found at
runtime without some fixups.
Fixes #1469
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
For some reason we only tried to fix libgit2 but not the libssh2 that it depend
on. Weird.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The existing test was backwards and never worked.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
When building with -builddeps on a "virgin" mac, configure
of libgit2 could not find libcurl and libssh2
moved building of libcurl and libssh2 in front of libgit2
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Missed a "cd $SRC" so when building with
-build-deps the script broke
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Specifically, don't conflate needing libgit2 with the Mac -builddep
argument, and when determining if we need to build libgit2 on Linux,
make sure to also check for a version that we may have built in a
previous run of the build.sh script.
This commit is much easier to understand with
git show -w
as it contains quite a bit of simple indentation change.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
get-dep-lib has been integrated into build.sh, which
ensures different platforms use the same versions etc.
travis is a frequent user of build.sh, but on a mac it runs
without -build-deps and instead used cached versions of the
library. This setup is alo supported
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
For reasons I cannot explain, running configure for libdivecomputer claims that
certain feature tests pass, even though those features demonstrably aren't
there. This is happening for two compiler warning flags (-Wrestrict &
-Wno-unused-but-set-variable) as well as the test for clock_gettime.
To work around this, we manually edit the config.h file and the created
Makefile before building libdivecomputer.
This happened on macOS 10.11.6 with clang-800.0.42.1 (part of Xcode 8.2.1).
Tangentially related to:
See #1263
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
...to explain the difference between building the mobile
version to run on desktop and crossbuild for a mobile OS.
This should address #1247
Signed-off-by: Robert C. Helling <helling@atdotde.de>
|
|
Signed-off-by: Robert C. Helling <helling@atdotde.de>
|
|
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
|
|
Trivial fix. Do not first cd to the ./src/subsurface directory, and then prepend
the subsurface directory to the path.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This needed to be fixed in googlemaps instead.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
I can't seem to find a way to make this work on both Linux and Mac.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This otherwise causes a failure on Linux builds.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This prevented googlemaps from building in some circumstances.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This adds a -skip-googlemaps option to the build script since for some
reason trying to build the googlemaps plugin in the Travis mac
environment causes an error with a missing stack-protector-strong
feature.
The build relies on a custom build Qt and a cached homebrew environment.
And the result is of course not a DMG with a signed app but a zip file
with an unsigned app - so it's a bit harder to consume.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This makes it easier to create an AppImage from the build artifacts.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
We had not done this on Linux as it was just as easy to run from the build
environment, but we need to install in order to be able to create an AppImage
on Travis.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
please note, that i have no way to test most of the scripts ATM.
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This is based on a script that Lubomir worked on and sent to the mailing
list.
Suggested-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Trusty (Travis) doesn't support -std=c++1z and -Wdate-time - and the
module doesn't need them.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Build in a 'build' subdirectory and use the INSTALL_ROOT. Also make sure
you find qmake on custom Qt installations.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The source code is pulled from the forked repository at:
git@github.com:Subsurface-divelog/googlemaps.git
It's rebased if needed, build using 'make -j4' and then
installed.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
Otherwise this will cause error when the variable is undefined.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Even if WebKit may exist on Linux, by default we no longer should build against
it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
And in the process make NOT building against Marble the default.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Also remove a left behind debug printout.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Including working around a weird hack to install the Grantlee
plugins.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Allow turning it on for those who have it, but by default
build without it on Mac.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
Murillo Bernardes
Dirk Hohndel
jan Iversen
Cristian Ionescu-Idbohrn
Robert C. Helling
Miika Turkia
Jan Mulder
Stefan Fuchs
Lubomir I. Ivanov