From 1eab0d2559e8625f0af1709df401e8ede3ab1800 Mon Sep 17 00:00:00 2001 From: drTr0jan Date: Tue, 11 Jan 2022 18:45:27 +0300 Subject: [PATCH 1/3] phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. --- src/modules/phonenum/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index 4f187fccf6f..f465226a974 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -5,13 +5,11 @@ include ../../Makefile.defs auto_gen= NAME=phonenum.so -CXX=g++ -LD=g++ -LIB_DIR = /opt/local/lib +CXX?=g++ +LD?=g++ -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding - -DEFS+= -I/opt/local/include +LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding +DEFS+=-I$(LOCALBASE)/include CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing From e6c6a6e4435d37ffb414fc649b710365ab0b52ad Mon Sep 17 00:00:00 2001 From: drTr0jan Date: Tue, 11 Jan 2022 18:45:45 +0300 Subject: [PATCH 2/3] websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- src/modules/websocket/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index f74003225b6..764453b0801 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -39,7 +39,8 @@ endif LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) - LIBS+= -lunistring + DEFS += -I$(LOCALBASE)/include + LIBS += -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif From ca4a0b586a99d09d4042d7df2ff95cce12808dbb Mon Sep 17 00:00:00 2001 From: drTr0jan Date: Thu, 13 Jan 2022 11:03:56 +0300 Subject: [PATCH 3/3] rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- src/modules/rtp_media_server/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rtp_media_server/Makefile b/src/modules/rtp_media_server/Makefile index 5386a3065a2..18645c209a5 100644 --- a/src/modules/rtp_media_server/Makefile +++ b/src/modules/rtp_media_server/Makefile @@ -2,11 +2,11 @@ include ../../Makefile.defs auto_gen= NAME=rtp_media_server.so -DEFS+=-I$(LOCALBASE)/lib +DEFS+=-I$(LOCALBASE)/include ORTPLIBS=-lortp BCUNITLIBS=-lbcunit MS2LIBS=-lmediastreamer -LIBS=$(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) +LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) include ../../Makefile.modules