Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk11 + asterisk13: use system libedit

Browse source 
libedit now includes a pkgconfig file, meaning asterisk can detect it.
So use the system libedit instead having asterisk include an internal
copy.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-09-02 00:17:42 +02:00
parent b6a8bbd5fb
commit 8554506b3b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/asterisk-11.x/Makefile
View file

@ -99,7 +99,7 @@ define Package/asterisk11
$(call Package/asterisk11/Default) $(call Package/asterisk11/Default)
TITLE:=Complete open source PBX, v$(PKG_VERSION) TITLE:=Complete open source PBX, v$(PKG_VERSION)
MENU:=1 MENU:=1
DEPENDS:=+libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32 DEPENDS:=+libopenssl +libedit +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
CONFLICTS:=asterisk13 CONFLICTS:=asterisk13
endef endef
@ -255,6 +255,7 @@ CONFIGURE_ARGS+= \
--with-ilbc=internal \ --with-ilbc=internal \
--without-isdnnet \ --without-isdnnet \
--without-libxml2 \ --without-libxml2 \
--with-libedit="$(STAGING_DIR)/usr" \
--without-misdn \ --without-misdn \
--without-nbs \ --without-nbs \
--with-ncurses="$(STAGING_DIR)/usr" \ --with-ncurses="$(STAGING_DIR)/usr" \

3
net/asterisk-13.x/Makefile
View file

@ -99,7 +99,7 @@ define Package/asterisk13
$(call Package/asterisk13/Default) $(call Package/asterisk13/Default)
TITLE:=Complete open source PBX, v$(PKG_VERSION) TITLE:=Complete open source PBX, v$(PKG_VERSION)
MENU:=1 MENU:=1
DEPENDS:=+jansson +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib DEPENDS:=+jansson +libedit +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
endef endef
define Package/asterisk13/description define Package/asterisk13/description
@ -198,6 +198,7 @@ CONFIGURE_ARGS+= \
--without-nbs \ --without-nbs \
--without-neon \ --without-neon \
--without-neon29 \ --without-neon29 \
--with-libedit="$(STAGING_DIR)/usr" \
--with-libxml2 \ --with-libxml2 \
--with-ncurses="$(STAGING_DIR)/usr" \ --with-ncurses="$(STAGING_DIR)/usr" \
--without-netsnmp \ --without-netsnmp \