asterisk11: use internal libedit

[feed/telephony.git] / net / asterisk-11.x / Makefile

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 64ca39afe20e53f1043f3ec962926821df4d702e..ca01fb344854f4f8a7cab5b07b596ed784052312 100644 (file)
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -63,7 +63,7 @@ define BuildAsterisk11Module
   endef
 
   define Package/asterisk11-$(1)/conffiles
-$(5)
+$(subst $(space),$(newline),$(foreach c,$(5),$(c)))
   endef
 
   define Package/asterisk11-$(1)/description
@@ -99,7 +99,7 @@ define Package/asterisk11
 $(call Package/asterisk11/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
-  DEPENDS:=+libopenssl +libedit +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
+  DEPENDS:=+libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
   CONFLICTS:=asterisk13
 endef
 
@@ -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) \
@@ -255,7 +254,7 @@ CONFIGURE_ARGS+= \
        --with-ilbc=internal \
        --without-isdnnet \
        --without-libxml2 \
-       --with-libedit="$(STAGING_DIR)/usr" \
+       --with-libedit=internal \
        --without-misdn \
        --without-nbs \
        --with-ncurses="$(STAGING_DIR)/usr" \
@@ -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="" \