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/dbus-glib/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/dbus-glib/Makefile')
| -rw-r--r-- | package/dbus-glib/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index 6d6b3c99a..a8bb27405 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= dbus-glib PKG_VERSION:= 0.100.2 PKG_RELEASE:= 1 PKG_MD5SUM:= ad0920c7e3aad669163bb59171cf138e -PKG_DESCR:= DBUS glib bindings -PKG_SECTION:= libs +PKG_DESCR:= glib bindings for dbus +PKG_SECTION:= libs/misc PKG_DEPENDS:= libdbus glib PKG_BUILDDEP:= dbus glib PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings @@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-checks CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no |