Attached 2 Android related build patches.
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 <[email protected]>
---
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 <[email protected]>
---
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
--
>From f8098c4feacb7b80dc3a77e2d9cf2cb2b6e2af49 Mon Sep 17 00:00:00 2001
From: Jan Mulder <[email protected]>
Date: Tue, 2 Feb 2016 10:17:51 +0100
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 <[email protected]>
---
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
--
2.7.0
>From be38aad1699db565a3f808fadf5cb9297ec71935 Mon Sep 17 00:00:00 2001
From: Jan Mulder <[email protected]>
Date: Tue, 2 Feb 2016 10:11:02 +0100
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 <[email protected]>
---
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
--
2.7.0
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
