diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
| commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
| tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/asterisk | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/asterisk')
| -rw-r--r-- | package/asterisk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index f436d9ef7..964c417df 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -17,7 +17,7 @@ PKG_MULTI:= 1 PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_LIBC_DEPENDS:= uclibc eglibc glibc +PKG_LIBC_DEPENDS:= uclibc glibc PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM |