missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'ics-openconnect-update' into 'master'

Browse source 
Allow ics-openconnect to build under JDK8

See merge request !2233
This commit is contained in:
Boris Kraut 2017-05-21 23:43:37 +00:00
parent 663586fed8 a9d0024116
commit 395d11e00d
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
metadata/app.openconnect.txt
View file

@ -113,6 +113,7 @@ Build:1.02,1029
Build:1.11,1119
commit=v1.11
submodules=yes
patch=stoken-java-7.diff,no-textrel-gmp.diff
srclibs=ACRA@acra-4.5.0
rm=libs/*
prebuild=pushd $$ACRA$$ && \
@ -120,7 +121,9 @@ Build:1.11,1119
popd && \
cp $$ACRA$$/target/acra-4.5.0.jar libs/ && \
make -C external/openconnect/android sources
scandelete=external/openconnect/android/sources/gnutls-3.2.21/doc/credentials
build=make -C external NDK=$$NDK$$
ndk=r10e
Maintainer Notes:
TODO: libs/openconnect-wrapper.jar

12
metadata/app.openconnect/no-textrel-gmp.diff Normal file
View file

@ -0,0 +1,12 @@
diff --git a/external/openconnect/android/Makefile b/external/openconnect/android/Makefile
--- a/external/openconnect/android/Makefile
+++ b/external/openconnect/android/Makefile
@@ -51,7 +51,7 @@ FETCH=$(TOPDIR)/fetch.sh
CONFIGURE_ARGS := --host=$(TRIPLET) --prefix=$(OC_SYSROOT) \
--disable-shared --enable-static \
- CFLAGS="$(EXTRA_CFLAGS)"
+ --disable-assembly CFLAGS="$(EXTRA_CFLAGS)"
SOURCE_LIST = $(LIBXML2_SRC)/configure $(GMP_SRC)/configure \
$(NETTLE_SRC)/configure $(GNUTLS_SRC)/configure \

13
metadata/app.openconnect/stoken-java-7.diff Normal file
View file

@ -0,0 +1,13 @@
diff --git a/external/stoken/java/build.xml b/external/stoken/java/build.xml
index ded2a76..5f821bb 100644
--- a/external/stoken/java/build.xml
+++ b/external/stoken/java/build.xml
@@ -5,6 +5,8 @@
<property name="jar_lib" location="${dist}/stoken-wrapper.jar"/>
<property name="jar_app" location="${dist}/example.jar"/>
+ <property name="ant.build.javac.source" value="1.7"/>
+ <property name="ant.build.javac.target" value="1.7"/>
<target name="init">
<mkdir dir="${build}"/>