Merge "Produce friendly error when AST_MODULE_SELF_SYM is not defined."
This commit is contained in:
commit
393d571e93
3 changed files with 6 additions and 2 deletions
|
@ -25,7 +25,7 @@ CFLAGS+= -fPIC -Wno-comment
|
|||
|
||||
# The code here generates lots of warnings, so compiling with -Werror
|
||||
# fails miserably. Remove it for the time being.
|
||||
_ASTCFLAGS:=$(_ASTCFLAGS:-Werror=)
|
||||
_ASTCFLAGS:=$(_ASTCFLAGS:-Werror=) -DAST_MODULE_SELF_SYM=__internal_codec_lpc10_self
|
||||
|
||||
LIB = $(LIB_TARGET_DIR)/liblpc10.a
|
||||
|
||||
|
|
|
@ -286,6 +286,10 @@ struct ast_module;
|
|||
/* Internal/forward declaration, AST_MODULE_SELF should be used instead. */
|
||||
struct ast_module *AST_MODULE_SELF_SYM(void);
|
||||
|
||||
#else
|
||||
|
||||
#error "Externally compiled modules must declare AST_MODULE_SELF_SYM."
|
||||
|
||||
#endif
|
||||
|
||||
/*!
|
||||
|
|
|
@ -284,7 +284,7 @@ ifeq ($(GNU_LD),1)
|
|||
endif
|
||||
|
||||
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB) $(PJ_LDFLAGS)
|
||||
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS)
|
||||
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
|
||||
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lrt -lpthread
|
||||
ifeq ($(GNU_LD),1)
|
||||
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
|
||||
|
|
Loading…
Reference in a new issue