summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Kemper2017-09-10 20:15:38 +0000
committerSebastian Kemper2017-09-10 20:15:40 +0000
commit1538a855d445c1e10a9e0119ac2c9abf6505bc71 (patch)
treec00b1c8b6b1d6347411eea89b514dc12f3390365
parent3dd0dfe492fd549153e2fc38c6fa53e6b3d59dc1 (diff)
downloadtelephony-1538a855d445c1e10a9e0119ac2c9abf6505bc71.tar.gz
asterisk11: clean up compile stage
- Don't add extra TARGET_LDFLAGS for asterisk13-pbx-lua. It is not needed anymore. - Stop setting -Wl,-rpath-link in LDFLAGS. There seems to be no point to do that (anymore). - Stop calling specific make targets like version.h; make handles the build properly without it. - Add AST_FORTIFY_SOURCE to MAKE_FLAGS (seen in Debian rules file, prevents asterisk's build system to mess with OpenWrt/LEDE flags). Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
-rw-r--r--net/asterisk-11.x/Makefile11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 64ca39a..ffd9ceb 100644
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -201,7 +201,6 @@ endif
ifneq ($(CONFIG_PACKAGE_asterisk11-pbx-lua),)
CONFIGURE_ARGS+= \
--with-lua="$(STAGING_DIR)/usr"
- TARGET_LDFLAGS+=-ldl -lcrypt
else
CONFIGURE_ARGS+= \
--without-lua
@@ -241,8 +240,8 @@ else
--without-iksemel
endif
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
+
CONFIGURE_ARGS+= \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -327,13 +326,9 @@ define Build/Compile
--disable BUILD_NATIVE \
$(if $(CONFIG_ASTERISK11_LOW_MEMORY),--enable LOW_MEMORY) \
menuselect.makeopts
- $(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
- include/asterisk/buildopts.h defaults.h \
- makeopts.embed_rules
- ASTCFLAGS="$(EXTRA_CFLAGS)" \
- ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
$(MAKE) -C "$(PKG_BUILD_DIR)" \
ASTDATADIR="/usr/share/asterisk" \
+ AST_FORTIFY_SOURCE="" \
NOISY_BUILD="yes" \
DEBUG="" \
OPTIMIZE="" \