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/vlc | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/vlc')
| -rw-r--r-- | package/vlc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/vlc/Makefile b/package/vlc/Makefile index cab09241a..67f0ec763 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/ PKG_ARCH_DEPENDS:= !m68k -PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_LIBC_DEPENDS:= glibc musl DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz |