Fix segfault with evince

[hvlinux.git] / stage1 / pkg / coreutils

diff --git a/stage1/pkg/coreutils b/stage1/pkg/coreutils
index cca4020..f04cb86 100644 (file)
--- a/stage1/pkg/coreutils
+++ b/stage1/pkg/coreutils
@@ -1,15 +1,14 @@
 #!/bin/bash
 
-hvconfig_pre()
+hvconfig_post()
 {
-    # Fix a bug when the uname patch is automatically applied
-    touch ${LFS_TMP}/${PACKAGE}/man/hostname.1
+    cd ${BUILD_DIR}
+    sed -e 's/^#\(run_help2man.*dummy-man\)/\1/' \
+        -e 's/^\(run_help2man.*PERL.*\)/#\1/' \
+        -i Makefile
 
-    # Patches may modify many .c files, so the make process will try to
-    # re-build the manpages by running help2man, and this causes problems
-    # when cross-compiling. So let's just update the timestamps and skip the
-    # help2man step.
-    find ${LFS_TMP}/${PACKAGE} -name \*.1 -exec touch {} \;
+    # Prevent autoreconf from discarding our modification to Makefile:
+    touch Makefile{,.in,.am}
 }
 
 # Configure cannot properly determine how to get free space when cross-compiling
@@ -17,9 +16,8 @@ hvconfig_pre()
 # config.cache  to correct this, and fix various cross-compiling issues:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 fu_cv_sys_stat_statfs2_bsize=yes
 gl_cv_func_working_mkstemp=yes
-gl_cv_func_fstatat_zero_flag=yes
 EOF
 }