diff options
| -rw-r--r-- | package/eglibc/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux-ng/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux-ng/patches/patch-configure | 16 | ||||
| -rw-r--r-- | package/xcb-proto/Makefile | 5 |
4 files changed, 21 insertions, 4 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index ddd86201b..a97b594ec 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -85,7 +85,7 @@ eglibc-dev-install: ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ - cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \ + cd $(IDIR_EGLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \ done # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 2632aa310..6e433a1c7 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.18 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= aff22adfff1bf39cd3f13371b95a3d3a PKG_DESCR:= Linux utilities PKG_SECTION:= fs diff --git a/package/util-linux-ng/patches/patch-configure b/package/util-linux-ng/patches/patch-configure new file mode 100644 index 000000000..4c61b8640 --- /dev/null +++ b/package/util-linux-ng/patches/patch-configure @@ -0,0 +1,16 @@ +--- util-linux-ng-2.18.orig/configure 2010-06-30 14:53:01.000000000 +0200 ++++ util-linux-ng-2.18/configure 2011-02-01 16:31:25.000000000 +0100 +@@ -15816,13 +15816,6 @@ else + fi + + +-case "$enable_libblkid:$enable_libmount" in +-no:yes) +- { { $as_echo "$as_me:$LINENO: error: cannot enable libmount when libblkid is disabled" >&5 +-$as_echo "$as_me: error: cannot enable libmount when libblkid is disabled" >&2;} +- { (exit 1); exit 1; }; } ;; +-esac +- + + + diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index f4b7004fc..f553ca74d 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -21,8 +21,9 @@ include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) post-install: - ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share + ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share/ ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share - ${CP} ${WRKINST}/usr/share/xcb ${STAGING_TARGET_DIR}/usr/share + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb + ${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_TARGET_DIR}/usr/share/xcb include ${TOPDIR}/mk/pkg-bottom.mk |