commit 7e2f5f0e29ccf30516db6587c5105d7113a5468e parent ce8d571ca7a13771493e5aa4afb0fa7cdd316e64 Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Tue, 17 Jun 2014 21:38:47 +0200 e2fsprogs: copy dependant files to separate libdev dir remove config.h (it conflicts with other ports). Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org> Diffstat:
| M | e2fsprogs/depsinc.mk | | | 11 | +++++++---- |
| M | e2fsprogs/e2fsprogs.mk | | | 8 | ++++++-- |
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/e2fsprogs/depsinc.mk b/e2fsprogs/depsinc.mk @@ -1,7 +1,10 @@ <$e2fsprogs_DEPDIR/v.mk -e2fsprogs_includedir = ${e2fsprogs_DEPDIR}/e2fsprogs-$v/lib -e2fsprogs_libdir = ${e2fsprogs_DEPDIR}/e2fsprogs-$v/lib/uuid +e2fsprogs_includedir = ${e2fsprogs_DEPDIR}/e2fsprogs-$v/libdev/lib +e2fsprogs_libdir = ${e2fsprogs_DEPDIR}/e2fsprogs-$v/libdev/lib/uuid -DEPS_CFLAGS = $DEPS_CFLAGS -I${e2fsprogs_includedir} -DEPS_LDFLAGS = $DEPS_LDFLAGS -L${e2fsprogs_libdir} -luuid +e2fsprogs_CFLAGS = -I${e2fsprogs_includedir} +e2fsprogs_LDFLAGS = -L${e2fsprogs_libdir} -luuid + +DEPS_CFLAGS = $DEPS_CFLAGS ${e2fsprogs_CFLAGS} +DEPS_LDFLAGS = $DEPS_LDFLAGS ${e2fsprogs_LDFLAGS} diff --git a/e2fsprogs/e2fsprogs.mk b/e2fsprogs/e2fsprogs.mk @@ -4,13 +4,18 @@ TARG = e2fsprogs e2fsprogs:QV: CC="$CC -static" CFLAGS="-D__uint64_t=u_int64_t" ./configure \ - --prefix="" \ + --prefix="$PREFIX" \ --disable-nls \ --bindir="$BINDIR" \ --sbindir="$BINDIR" \ --libexecdir="$BINDIR" \ --mandir="$PREFIX/share/man" make -j$nprocs + # copy files for use as a dependency. + rm -rf libdev + mkdir -p libdev + cp -a lib libdev/ + rm -f libdev/lib/config.h* install:QV: make -j$nprocs DESTDIR="$ROOT" install @@ -25,4 +30,3 @@ install:QV: ln -s e2fsck fsck.ext3 ln -s e2fsck fsck.ext4 ln -s e2fsck fsck.ext4dev -