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/libxcb | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libxcb')
-rw-r--r-- | package/libxcb/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
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: |