lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

050-add-missing-make-defines.patch (1996B)


      1 --- a/builders/make/compile.mk
      2 +++ b/builders/make/compile.mk
      3 @@ -58,7 +58,7 @@ DEFINES = $(PLATFORM_DEFINES) $(FEATURES
      4  
      5  #library paths
      6  SSL_INCLUDE=-I$(SSL_BASE)/include
      7 -SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto
      8 +SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto -ldl
      9  
     10  #lua
     11  LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev
     12 @@ -72,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
     13  
     14  #common
     15  COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
     16 -COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt
     17 +COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) $(PROJECT_BASE_PATH)/builders/make/output/dynamic/liblua.so -ltinyxml -lcrypt -ldl
     18  COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp")
     19  COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o)
     20  
     21  #thelib
     22  THELIB_INCLUDE=$(COMMON_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/thelib/include
     23 -THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon
     24 +THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon -ldl
     25  THELIB_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/thelib/src -type f -name "*.cpp")
     26  THELIB_OBJS = $(THELIB_SRCS:.cpp=.thelib.o)
     27  
     28  #tests
     29  TESTS_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/tests/include
     30 -TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
     31 +TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
     32  TESTS_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/tests/src -type f -name "*.cpp")
     33  TESTS_OBJS=$(TESTS_SRCS:.cpp=.tests.o)
     34  
     35  #crtmpserver
     36  CRTMPSERVER_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/crtmpserver/include
     37 -CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
     38 +CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
     39  CRTMPSERVER_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/crtmpserver/src -type f -name "*.cpp")
     40  CRTMPSERVER_OBJS_DYNAMIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_dynamic.o)
     41  CRTMPSERVER_OBJS_STATIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_static.o)