summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-25 07:05:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-25 07:05:35 +0200
commit98409fcf5f0c9b9ae8eebf1dd425ff3e5195a990 (patch)
tree07defed43b32c4eb1d23c4591e09c019bc7eea20
parentce64829c0d165fe0f25c861117a359b05293ec51 (diff)
only build one copy of libuuid/libblkid
-rw-r--r--package/e2fsprogs/Makefile6
-rw-r--r--package/util-linux-ng/Makefile4
2 files changed, 5 insertions, 5 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 0b8a69eea..a61fa4e63 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -58,6 +58,9 @@ MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \
BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}"
post-build:
+ ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
+ ${CP} ${WRKBUILD}/lib/uuid/uuid.h \
+ ${STAGING_DIR}/usr/include/uuid
ifeq ($(ADK_PACKAGE_E2FSCK_STATIC),y)
${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static
${INSTALL_DIR} ${WRKINST}/usr/sbin
@@ -111,9 +114,6 @@ libuuid-install:
${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
${CP} ${WRKINST}/usr/lib/libuuid.so* \
${IDIR_LIBUUID}/usr/lib
- ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
- ${CP} ${WRKBUILD}/lib/uuid/uuid.h \
- ${STAGING_DIR}/usr/include/uuid
libuuid-dev-install:
${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 5866f5135..7cdacf554 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -37,8 +37,8 @@ $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
CONFIGURE_ARGS+= --disable-use-tty-group \
--disable-schedutils \
--disable-cramfs \
- --enable-libuuid \
- --enable-libblkid \
+ --disable-libuuid \
+ --disable-libblkid \
--enable-libmount \
--enable-mount
MAKE_FLAGS+= OPT="${TARGET_CFLAGS}" ARCH="${ARCH}"