diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-01 16:42:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-01 16:42:21 +0200 |
| commit | f98e675fd2fb13847dbe2481765f96e4e3dd9e14 (patch) | |
| tree | 560090f0edaddbb16ce0a392b638ca54f448b694 /package | |
| parent | e8c76b35182a24385949e28c76c56db0d86bb7b0 (diff) | |
| parent | e030bbd818f3cee94a8bda7df01a63f1a3439eb1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/fltk/Makefile | 2 | ||||
| -rw-r--r-- | package/xcb-proto/Makefile | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/fltk/Makefile b/package/fltk/Makefile index bc0607942..e829fcc57 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -30,6 +30,8 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) LIBRARIES+=-lssp endif +CONFIGURE_ARGS+= --disable-xinerama + ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 893287ee1..93d8e8128 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -23,11 +23,13 @@ include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) +post-build: + ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb + ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb + xcb-proto-install: ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb - ${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/pkgconfig ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcb-proto.pc \ ${IDIR_XCB_PROTO}/usr/lib/pkgconfig |