4 Jul
2022
4 Jul
'22
7:44 a.m.
Module: kamailio
Branch: master
Commit: 06e2363a961a1f7f866faee81aeac737db2359fc
URL: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73…
Author: S-P Chan <shihping.chan(a)gmail.com>
Committer: S-P Chan <shihping.chan(a)gmail.com>
Date: 2022-07-04T19:43:35+08:00
tls_wolfssl: move git submodule to misc/external/wolfssl
- GH #3164
---
Added: misc/external/wolfssl/.gitignore
Added: misc/external/wolfssl/wolfssl
Modified: .gitmodules
Modified: src/modules/tls_wolfssl/Makefile
Removed: src/modules/tls_wolfssl/lib/wolfssl
---
Diff:
https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73…
Patch:
https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73…
---
diff --git a/.gitmodules b/.gitmodules
index 97045b8acd8..1d8f99966ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,5 +2,5 @@
path = pkg/docker
url = https://github.com/kamailio/kamailio-ci.git
[submodule "src/modules/tls_wolfssl/lib/wolfssl"]
- path = src/modules/tls_wolfssl/lib/wolfssl
+ path = misc/external/wolfssl/wolfssl
url = https://github.com/wolfSSL/wolfssl.git
diff --git a/misc/external/wolfssl/.gitignore b/misc/external/wolfssl/.gitignore
new file mode 100644
index 00000000000..567609b1234
--- /dev/null
+++ b/misc/external/wolfssl/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/src/modules/tls_wolfssl/lib/wolfssl b/misc/external/wolfssl/wolfssl
similarity index 100%
rename from src/modules/tls_wolfssl/lib/wolfssl
rename to misc/external/wolfssl/wolfssl
diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile
index 687fe1a4947..f6a27f7f34e 100644
--- a/src/modules/tls_wolfssl/Makefile
+++ b/src/modules/tls_wolfssl/Makefile
@@ -8,15 +8,17 @@ include ../../Makefile.defs
auto_gen=
NAME=tls_wolfssl.so
-LIBS += lib/lib/libwolfssl.a
-INCLUDES += -I./lib/include/
+WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build
+WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl
+LIBS += $(WOLFSSL_PREFIX)/lib/libwolfssl.a
+INCLUDES += -I$(WOLFSSL_PREFIX)/include/
include ../../Makefile.modules
-$(objs): lib/include/wolfssl/options.h
+$(objs): $(WOLFSSL_PREFIX)/include/wolfssl/options.h
-lib/include/wolfssl/options.h lib/lib/libwolfssl.a:
- @cd ./lib/wolfssl; \
+$(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a:
+ @cd $(WOLFSSL_SRC); \
if [ ! -f "configure" ]; then \
./autogen.sh; \
fi; \
@@ -24,16 +26,16 @@ lib/include/wolfssl/options.h lib/lib/libwolfssl.a:
env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC
-Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \
--enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \
--disable-shared --disable-examples \
- --prefix=$(CURDIR)/lib \
- --exec-prefix=$(CURDIR)/lib; \
+ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \
+ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \
fi;
- @$(MAKE) -C ./lib/wolfssl install
+ @$(MAKE) -C $(WOLFSSL_SRC) install
-$(NAME): lib/lib/libwolfssl.a
+$(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a
clean-wolfssl:
- @rm -rf ./lib/{bin,include,share,lib}; \
- (cd ./lib/wolfssl; make distclean) || /bin/true
+ @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \
+ (cd $(WOLFSSL_SRC); make distclean) || /bin/true
clean-module:
@rm -f *.o *.so