[Asterisk-code-review] pjproject bundled: Find shared libraries in root --with-ssl=... (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/9774 )

Change subject: pjproject_bundled: Find shared libraries in root --with-ssl=PATH.
......................................................................

pjproject_bundled: Find shared libraries in root --with-ssl=PATH.

The script configure from Teluu expects shared libraries (.so) in a subfolder
called 'lib', when --with-xyz=PATH is specified. However for OpenSSL, the
default location is the root of the source folder = PATH. Furthermore, Asterisk
supports both, 'lib' and root. For consistency and because Asterisk is using
(only) OpenSSL in PJProject, it is enhanced to support both locations, just
like Asterisk.

ASTERISK-27995

Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f
---
A third-party/pjproject/patches/0000-configure-ssl-library-path.patch
1 file changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
new file mode 100644
index 0000000..0ec0e7a
--- /dev/null
+++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
@@ -0,0 +1,18 @@
+--- a/aconfigure.ac	(PJSIP 2.7.2)
++++ b/aconfigure.ac	(working copy)
+@@ -1571 +1571,5 @@
+-                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    if test -d $with_ssl/lib; then
++                        LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    else
++                        LDFLAGS="$LDFLAGS -L$with_ssl"
++                    fi
+--- a/aconfigure	(PJSIP 2.7.2)
++++ b/aconfigure	(working copy)
+@@ -7884 +7884,5 @@
+-                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    if test -d $with_ssl/lib; then
++                        LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    else
++                        LDFLAGS="$LDFLAGS -L$with_ssl"
++                    fi

-- 
To view, visit https://gerrit.asterisk.org/9774
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f
Gerrit-Change-Number: 9774
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180806/6098f5d6/attachment-0001.html>