<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Attached 2 Android related build patches.<br>
<br>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<pre>Subject: [PATCH 1/2] Build Android mobile app against latest OpenSSL
No reasons not to upgrade to the latest OpenSSL lib. The currently used
1.0.1 branch is ending end of 2016, so a switch to 1.0.2 is useful
anyway.
Signed-off-by: Jan Mulder <a class="moz-txt-link-rfc2396E" href="mailto:jlmulder@xs4all.nl"><jlmulder@xs4all.nl></a>
---
packaging/android/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 2f03d4e..d9d9251 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -38,7 +38,7 @@ LIBZIP_VERSION=0.11.2
LIBGIT2_VERSION=0.23.4
LIBSSH2_VERSION=1.6.0
LIBUSB_VERSION=1.0.19
-OPENSSL_VERSION=1.0.1p
+OPENSSL_VERSION=1.0.2f
LIBFTDI_VERSION=1.2
# arm or x86
--
Subject: [PATCH 2/2] Simplify building of Android build from one source tree
Currently, when running the packaging/android/build.sh from a source
tree that has been used for desktop builds, libdivecomputer wants a
make distclean. This is inconvinient, and is caused by building
libdivecomputer in source. Now, configure and build libdivecomputer
in a new subdirectory, allowing to run the android build script
from the same source tree as the desktop (both desktop and mobile)
builds.
Signed-off-by: Jan Mulder <a class="moz-txt-link-rfc2396E" href="mailto:jlmulder@xs4all.nl"><jlmulder@xs4all.nl></a>
---
scripts/build.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index b313cec..79264b0 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -109,10 +109,14 @@ if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up"
exit 1
fi
-if [ ! -f configure ] ; then
- autoreconf --install
+
+mkdir -p build
+cd build
+
+if [ ! -f ../configure ] ; then
+ autoreconf --install ..
fi
-./configure --prefix=$INSTALL_ROOT
+../configure --prefix=$INSTALL_ROOT
make -j4
make install
--
<title></title><meta name="generator" content="LibreOffice 5.0.4.2 (Linux)"><style type="text/css">
@page { margin: 0.79in }
p { margin-bottom: 0.1in; line-height: 120% }
</style>
</pre>
<title></title><meta name="generator" content="LibreOffice 5.0.4.2 (Linux)"><style type="text/css">
@page { margin: 0.79in }
p { margin-bottom: 0.1in; line-height: 120% }
</style>
</body></html>