Upgrade to vte-0.38.2

[hvlinux.git] / stage2 / pkg / e2fsprogs

diff --git a/stage2/pkg/e2fsprogs b/stage2/pkg/e2fsprogs
index 99f7e68..ed00a35 100644 (file)
--- a/stage2/pkg/e2fsprogs
+++ b/stage2/pkg/e2fsprogs
@@ -1,20 +1,34 @@
 #!/bin/bash
 
-PKG_CONFIG=true
+hvconfig_pre()
+{
+    export PKG_CONFIG=true
+
+    CONFIGURE_OPTS+=" \
+        --with-root-prefix=\"\" \
+        --enable-elf-shlibs \
+        --disable-libblkid \
+        --disable-libuuid \
+        --disable-fsck \
+        --disable-uuidd"
+}
+
+hvconfig_post()
+{
+    unset PKG_CONFIG
+}
 
-CONFIGURE_OPTS="\
-    --with-root-prefix="" \
-    --enable-elf-shlibs \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd \
-    ${CONFIGURE_OPTS}"
+hvbuild()
+{
+    ${HVMAKE} LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+        LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"
+    ${HVMAKE} install
+}
 
 hvbuild_post()
 {
     # Install the static libraries and headers:
-    make install-libs
+    ${HVMAKE} install-libs
 
     # Make the installed static libraries writable so debugging symbols can be removed later:
     chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a