Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
5d9fc76d
Commit
5d9fc76d
authored
Oct 21, 2014
by
Alexandre Lision
Browse files
Options
Downloads
Patches
Plain Diff
build: bump tested hash
Fix issue introduced by 17442b78a39fa24407e363a8c4b0025d3eed2c60
parent
47b6aaaf
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
compile.sh
+1
-1
1 addition, 1 deletion
compile.sh
configure.sh
+2
-2
2 additions, 2 deletions
configure.sh
with
3 additions
and
3 deletions
compile.sh
+
1
−
1
View file @
5d9fc76d
...
...
@@ -112,7 +112,7 @@ ANDROID_PATH="`pwd`"
if
[
!
-z
"
$FETCH
"
]
then
# 1/ libsflphone
TESTED_HASH
=
d3453ea4cd06c59503dd81d95f99ebf4be4ea14e
TESTED_HASH
=
e1d64e3447dbb936dc8e664f80c1f8e3adb3b189
if
[
!
-d
"sflphone"
]
;
then
echo
"sflphone daemon source not found, cloning"
git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone
...
...
This diff is collapsed.
Click to expand it.
configure.sh
+
2
−
2
View file @
5d9fc76d
...
...
@@ -39,7 +39,7 @@ ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`unam
CROSS_COMPILE
=
${
ANDROID_BIN
}
/
${
TARGET_TUPLE
}
-
# FIXME: this a temporary kludge to fix linking on Debian/Ubuntu, these are
# libaries we don't use directly and so shouldn't be adding them here
SFLPHONE_BROKEN_LIBS
=
" -L
$SFLPHONE_SOURCEDIR
/contrib/
$TARGET_TUPLE
/lib -lgcrypt -lFLAC -lvorbisenc -lgpg-error -lvorbis -logg"
SFLPHONE_BROKEN_LIBS
=
" -L
$SFLPHONE_SOURCEDIR
/contrib/
$TARGET_TUPLE
/lib -lgcrypt -lFLAC -lvorbisenc -lgpg-error -lvorbis -logg
-lspeex -lspeexdsp
"
CPPFLAGS
=
"
$CPPFLAGS
"
\
CFLAGS
=
"
$CFLAGS
${
SFLPHONE_EXTRA_CFLAGS
}
"
\
...
...
@@ -54,5 +54,5 @@ RANLIB="${CROSS_COMPILE}ranlib" \
AR
=
"
${
CROSS_COMPILE
}
ar"
\
PKG_CONFIG_LIBDIR
=
$SFLPHONE_SOURCEDIR
/contrib/
$TARGET_TUPLE
/lib/pkgconfig
\
sh
$SFLPHONE_SOURCEDIR
/configure
--host
=
$TARGET_TUPLE
$EXTRA_PARAMS
\
--disable-video
--with-opensl
--without-zrtp
--without-dbus
--without-alsa
--without-pulse
--without-tls
\
--disable-video
--with-opensl
--without-zrtp
--without-dbus
--without-alsa
--without-pulse
--without-tls
--without-dht
\
$*
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment