Add cross-compile ipkg mode for stage1 (DESTDIR)

[hvlinux.git] / stage1 / pkg / e2fsprogs

diff --git a/stage1/pkg/e2fsprogs b/stage1/pkg/e2fsprogs
index 159f339..0f407a2 100644 (file)
--- a/stage1/pkg/e2fsprogs
+++ b/stage1/pkg/e2fsprogs
@@ -1,32 +1,36 @@
 #!/bin/bash
 
-hvconfigure()
+hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}-build
+    export PKG_CONFIG=true
 
-    CC="${CC} ${CLFS_BUILDFLAGS}" PKG_CONFIG=true \
-        ../${PACKAGE}/configure \
-        --prefix=/tools \
+    CONFIGURE_OPTS+=" \
         --enable-elf-shlibs \
-        --with-linker=${LD} \
-        --host=${CLFS_TARGET} \
         --disable-libblkid \
         --disable-libuuid \
         --disable-fsck \
-        --disable-uuidd
+        --disable-uuidd"
+}
+
+hvconfig_post()
+{
+    unset PKG_CONFIG
 }
 
 hvbuild()
 {
     ${HVMAKE} LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
         LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"
-    ${HVMAKE} install
+    ${HVMAKE} DESTDIR=${LFS} install
 
     # Install the static libraries and headers:
-    ${HVMAKE} install-libs
+    ${HVMAKE} DESTDIR=${LFS} install-libs
+}
 
+hvbuild_post()
+{
     # Create needed symlinks for a bootable system:
-    LINKS="fsck.ext2 fsck.ext3 fsck.ext4 e2fsck"
+    LINKS="fsck.ext2 fsck.ext3 fsck.ext4 fsck.ext4dev e2fsck"
 
     for link in ${LINKS}; do
         ln -svfT /tools/sbin/${link} ${LFS}/sbin/${link}