mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
Add libjwt to third-party
The current STIR/SHAKEN implementation is not currently usable due
to encryption issues. Rather than trying to futz with OpenSSL and
the the current code, we can take advantage of the existing
capabilities of libjwt but we first need to add it to the
third-party infrastructure already in place for jansson and
pjproject.
A few tweaks were also made to the third-party infrastructure as
a whole. The jansson "dest" install directory was renamed "dist"
to better match convention, and the third-party Makefile was updated
to clean all product directories not just the ones currently in
use.
Resolves: #349
(cherry picked from commit d7a6116681
)
This commit is contained in:
committed by
Asterisk Development Team
parent
893483f915
commit
cfc6832062
2
third-party/jansson/.gitignore
vendored
2
third-party/jansson/.gitignore
vendored
@@ -1,4 +1,4 @@
|
||||
source/
|
||||
dest/
|
||||
dist/
|
||||
**.bz2
|
||||
.rebuild_needed
|
||||
|
11
third-party/jansson/Makefile
vendored
11
third-party/jansson/Makefile
vendored
@@ -39,7 +39,7 @@ ifeq ($(SPECIAL_TARGETS),)
|
||||
$(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)
|
||||
endif
|
||||
|
||||
all: dest/include/jansson.h
|
||||
all: dist/usr/lib/libjansson.a
|
||||
else
|
||||
all:
|
||||
endif
|
||||
@@ -57,10 +57,10 @@ endif
|
||||
ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '
|
||||
SHELL_ECHO_PREFIX := echo '[jansson] '
|
||||
|
||||
dest/include/jansson.h: source/config.status
|
||||
dist/usr/lib/libjansson.a: source/config.status
|
||||
$(ECHO_PREFIX) Building bundled jansson.
|
||||
$(CMD_PREFIX) (cd source; make $(REALLY_QUIET))
|
||||
$(CMD_PREFIX) (cd source; make install DESTDIR= $(REALLY_QUIET))
|
||||
$(CMD_PREFIX) (cd source; make install DESTDIR=$(JANSSON_DIR)/dist $(REALLY_QUIET))
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
|
||||
@@ -87,7 +87,7 @@ source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
|
||||
source/config.status: source/.unpacked Makefile.rules .rebuild_needed
|
||||
$(ECHO_PREFIX) Configuring
|
||||
$(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared \
|
||||
--enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib CFLAGS="$(OPTIMIZE_CFLAGS)")
|
||||
--enable-static --prefix=/usr --libdir=/usr/lib CFLAGS="$(OPTIMIZE_CFLAGS) -fPIC")
|
||||
|
||||
configure: source/config.status
|
||||
|
||||
@@ -96,8 +96,9 @@ uninstall:
|
||||
|
||||
clean:
|
||||
$(ECHO_PREFIX) Cleaning
|
||||
+-$(CMD_PREFIX) rm -rf dist
|
||||
+-$(CMD_PREFIX) test -d source && $(SUBMAKE) -C source clean $(REALLY_QUIET) || :
|
||||
|
||||
distclean:
|
||||
$(ECHO_PREFIX) Distcleaning
|
||||
-$(CMD_PREFIX) rm -rf source jansson-*.tar.bz2 .rebuild_needed
|
||||
-$(CMD_PREFIX) rm -rf dist source jansson-*.tar.bz2 .rebuild_needed
|
||||
|
4
third-party/jansson/configure.m4
vendored
4
third-party/jansson/configure.m4
vendored
@@ -69,9 +69,9 @@ AC_DEFUN([_JANSSON_CONFIGURE],
|
||||
|
||||
AC_MSG_CHECKING(for bundled jansson)
|
||||
|
||||
JANSSON_INCLUDE=-I${JANSSON_DIR}/dest/include
|
||||
JANSSON_INCLUDE=-I${JANSSON_DIR}/dist/usr/include
|
||||
JANSSON_CFLAGS="$JANSSON_INCLUDE"
|
||||
JANSSON_LIB="-L${JANSSON_DIR}/dest/lib -ljansson"
|
||||
JANSSON_LIB="-L${JANSSON_DIR}/dist/usr/lib -ljansson"
|
||||
PBX_JANSSON=1
|
||||
|
||||
# We haven't run install yet
|
||||
|
Reference in New Issue
Block a user