Module: kamailio Branch: master Commit: 14b1f79c29f317c74bbcbba75853ce45c353a865 URL: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45...
Author: Victor Seva linuxmaniac@torreviejawireless.org Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: 2023-05-15T13:35:48+02:00
tls_wolfssl: use wolfssl lib from system if available
---
Modified: src/modules/tls_wolfssl/Makefile
---
Diff: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45... Patch: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45...
---
diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..0eaa83c615f 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,12 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so
+WOLF_BUILDER = $(shell \ + if pkg-config --exists wolfssl; then \ + echo 'pkg-config wolfssl'; \ + fi) + +ifeq ($(WOLF_BUILDER),) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl
@@ -33,6 +39,12 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: @$(MAKE) -C $(WOLFSSL_SRC) install
$(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a +else + DEFS += $(shell $(WOLF_BUILDER) --cflags) + LIBS += $(shell $(WOLF_BUILDER) --libs) + + include ../../Makefile.modules +endif
clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \
Hello,
I think the reason for using source code for libwolfssl was the necessity to set some compile flags different that those used for building libwolfssl packages. Not sure if it is the same case now.
Cheers, Daniel
On 15.05.23 13:40, Victor Seva wrote:
Module: kamailio Branch: master Commit: 14b1f79c29f317c74bbcbba75853ce45c353a865 URL: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45...
Author: Victor Seva linuxmaniac@torreviejawireless.org Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: 2023-05-15T13:35:48+02:00
tls_wolfssl: use wolfssl lib from system if available
Modified: src/modules/tls_wolfssl/Makefile
Diff: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45... Patch: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45...
diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..0eaa83c615f 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,12 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so
+WOLF_BUILDER = $(shell \
- if pkg-config --exists wolfssl; then \
echo 'pkg-config wolfssl'; \
- fi)
+ifeq ($(WOLF_BUILDER),) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl
@@ -33,6 +39,12 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: @$(MAKE) -C $(WOLFSSL_SRC) install
$(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a +else
- DEFS += $(shell $(WOLF_BUILDER) --cflags)
- LIBS += $(shell $(WOLF_BUILDER) --libs)
- include ../../Makefile.modules
+endif
clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \
Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-leave@lists.kamailio.org
Hi
On 15/5/23 13:53, Daniel-Constantin Mierla wrote:
Hello,
I think the reason for using source code for libwolfssl was the necessity to set some compile flags different that those used for building libwolfssl packages. Not sure if it is the same case now.
I was getting build errors [0] when trying to integrate tls_wolfssl package.
[0] https://github.com/kamailio/kamailio/actions/runs/4978751198/jobs/8911286780