From b92b84b959c7d5f61789dbb8b69d830ab6af716e Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 19 Aug 2022 23:36:12 +0300 Subject: [PATCH] Use static libs where possible --- br-ext-chip-hisilicon/Config.in | 1 + br-ext-chip-hisilicon/external.mk | 1 + br-ext-chip-hisilicon/package/libsrtp-openipc | 1 + general/package/aws-producer/aws-producer.mk | 1 + general/package/aws-webrtc/aws-webrtc.mk | 2 +- general/package/libsrtp-openipc/Config.in | 8 +++++++ .../libsrtp-openipc/libsrtp-openipc.mk | 22 +++++++++++++++++++ general/package/usrsctp/usrsctp.mk | 1 + 8 files changed, 36 insertions(+), 1 deletion(-) create mode 120000 br-ext-chip-hisilicon/package/libsrtp-openipc create mode 100644 general/package/libsrtp-openipc/Config.in create mode 100644 general/package/libsrtp-openipc/libsrtp-openipc.mk diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 7e48f5af..57f3e742 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -29,6 +29,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libre-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/librem-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrtp-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libwebsockets-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/linux-firmware-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-fonts/Config.in" diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 098c1d88..583f8ac6 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -29,6 +29,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libre-openipc/libre-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/librem-openipc/librem-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrtp-openipc/libsrtp-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic/majestic.mk diff --git a/br-ext-chip-hisilicon/package/libsrtp-openipc b/br-ext-chip-hisilicon/package/libsrtp-openipc new file mode 120000 index 00000000..3bd0ec08 --- /dev/null +++ b/br-ext-chip-hisilicon/package/libsrtp-openipc @@ -0,0 +1 @@ +../../general/package/libsrtp-openipc \ No newline at end of file diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk index 7d6db227..63b2b87c 100644 --- a/general/package/aws-producer/aws-producer.mk +++ b/general/package/aws-producer/aws-producer.mk @@ -17,6 +17,7 @@ AWS_PRODUCER_CONF_OPTS += \ -DBUILD_DEPENDENCIES=FALSE \ -DUSE_OPENSSL=OFF \ -DUSE_MBEDTLS=ON \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release AWS_PRODUCER_MAKE_OPTS += VERBOSE=1 diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index e42db2e2..0c093a7a 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -22,7 +22,7 @@ AWS_WEBRTC_CONF_OPTS += \ AWS_WEBRTC_MAKE_OPTS += VERBOSE=1 AWS_WEBRTC_DEPENDENCIES = \ - libsrtp \ + libsrtp-openipc \ libwebsockets-openipc \ aws-producer \ usrsctp \ diff --git a/general/package/libsrtp-openipc/Config.in b/general/package/libsrtp-openipc/Config.in new file mode 100644 index 00000000..75545864 --- /dev/null +++ b/general/package/libsrtp-openipc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBSRTP_OPENIPC + bool "libsrtp_openipc" + help + This package provides an implementation of the Secure + Real-time Transport Protocol (SRTP), the Universal Security + Transform (UST), and a supporting cryptographic kernel. + + https://github.com/cisco/libsrtp diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk new file mode 100644 index 00000000..7860dcc9 --- /dev/null +++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libsrtp-openipc +# +################################################################################ + +LIBSRTP_OPENIPC_VERSION = bd0f27ec0e299ad101a396dde3f7c90d48efc8fc +LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp.git +LIBSRTP_OPENIPC_SITE_METHOD = git +LIBSRTP_OPENIPC_INSTALL_STAGING = YES +LIBSRTP_OPENIPC_LICENSE = BSD-3-Clause +LIBSRTP_OPENIPC_LICENSE_FILES = LICENSE +LIBSRTP_OPENIPC_CPE_ID_VENDOR = cisco + +LIBSRTP_OPENIPC_CONF_OPTS = \ + -DENABLE_OPENSSL=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_BUILD_TYPE:STRING=Release + +LIBSRTP_OPENIPC_MAKE_OPTS += VERBOSE=1 + +$(eval $(cmake-package)) diff --git a/general/package/usrsctp/usrsctp.mk b/general/package/usrsctp/usrsctp.mk index e6bcd894..288c1461 100644 --- a/general/package/usrsctp/usrsctp.mk +++ b/general/package/usrsctp/usrsctp.mk @@ -15,6 +15,7 @@ USRSCTP_CONF_OPTS += \ -Dsctp_werror=0 \ -Dsctp_build_programs=0 \ -Dsctp_debug=0 \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release USRSCTP_MAKE_OPTS += VERBOSE=1