From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/libxcb/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package/libxcb')

diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 563e08da7..8dffea1f3 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		libxcb
 PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a484793fbfb974b09d54fa1ebf44b2e4
-PKG_DESCR:=		X11 keyboard library
+PKG_DESCR:=		interface to the x window system protocol
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXau-host libpthread-stubs-host xcb-proto-host
 PKG_BUILDDEP+=		libxcb-host
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 include $(TOPDIR)/mk/python.mk
 
 HOST_STYLE:=		auto
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
 libxcb-install:
-- 
cgit v1.2.3