diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/glib | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index b18056f32..00560e4be 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 2.38.2 PKG_RELEASE:= 4 PKG_EXTRAVER:= 2.38 PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f -PKG_DESCR:= low-level core library that forms the basis of GTK+ -PKG_SECTION:= libs +PKG_DESCR:= low-level core library that forms the basis of gtk+ +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpthread PKG_BUILDDEP:= glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus HOST_BUILDDEP:= libffi-host gettext-tiny-host libiconv-tiny-host python2-host |