sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pjproject_bundled: Fix cross-compilation with SSL libs. 

Asterisk makefiles auto-detect SSL library availability,
then they assume that pjproject makefiles will also autodetect
an SSL library at the same time, so they do not pass on the
autodetection result to pjproject.

This normally works, except the pjproject makefiles disables
autodetection when cross-compiling.

Fix by explicitly configuring pjproject to use SSL if we
have been told to use it or it was autodetected

ASTERISK-30424 #close

Change-Id: I8fe2999ea46710e21d1d55a1bed92769c6ebded9
This commit is contained in:
Nick French 2023-02-11 06:58:43 -06:00 committed by Friendly Automation
parent 5c11d7adea
commit 200dc7d0e8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -10107,12 +10107,16 @@ $as_echo "configuring" >&6; }
y|ye|yes)
# Not to mention SSL is the default in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
;;
*)
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
;;
esac
else
if test $PBX_OPENSSL -eq 1 ; then
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
fi
fi
# Determine if we're doing an out-of-tree build...

6
third-party/pjproject/configure.m4 vendored
View File

@ -74,12 +74,16 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
y|ye|yes)
# Not to mention SSL is the default in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
;;
*)
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
;;
esac
else
if test $PBX_OPENSSL -eq 1 ; then
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
fi
fi
# Determine if we're doing an out-of-tree build...