ch6. coreutils-5.0-hostname.patch breaks make check (CVS 20030514)

Gerard Beekmans gerard at linuxfromscratch.org
Fri May 16 10:17:34 PDT 2003


On May 16, 2003 10:54 am, Zack Winkles wrote:
> This wouldn't work. The hostname patch goes right to the source: the
> Makefile.in's. The only way your fix would work is if we regenerated the
> Makefiles, which is way too much of a hassle.

Try changing the patch to patch the src/Makefile file instead. Something like 
this:

./configure --prefix=/usr &&
make &&
make check
patch -Np1 -i coreutils-hostname.patch &&
make install

This way when running make install the hostname and hostname.1 files won't get 
installed, which is the end result we want to accomplish.

And the patch:

diff -Naur coreutils-5.0.orig/man/Makefile coreutils-5.0/man/Makefile
--- coreutils-5.0.orig/man/Makefile	2003-05-16 11:11:06.000000000 -0600
+++ coreutils-5.0/man/Makefile	2003-05-16 11:11:33.000000000 -0600
@@ -152,7 +152,7 @@
   basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
-  head.1 hostid.1 hostname.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
+  head.1 hostid.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
   rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
diff -Naur coreutils-5.0.orig/src/Makefile coreutils-5.0/src/Makefile
--- coreutils-5.0.orig/src/Makefile	2003-05-16 11:11:19.000000000 -0600
+++ coreutils-5.0/src/Makefile	2003-05-16 11:15:47.000000000 -0600
@@ -165,7 +165,7 @@
   cat cksum comm csplit cut expand fmt fold head join md5sum \
   nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq 
wc \
   basename date dirname echo env expr factor false \
-  hostname id kill logname pathchk printenv printf pwd seq sleep tee \
+  id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
    uname$(EXEEXT) chroot$(EXEEXT) hostid$(EXEEXT) nice$(EXEEXT) 
pinky$(EXEEXT) users$(EXEEXT) who$(EXEEXT) uptime$(EXEEXT) stty$(EXEEXT) 
df$(EXEEXT)
 
@@ -305,7 +305,7 @@
 	tac$(EXEEXT) tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) \
 	unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) \
 	date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) \
-	expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) \
+	expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
 	id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
 	printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \
 	sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \


-- 
Gerard Beekmans
http://linuxfromscratch.org

/* Linux Consultant --- OSDN / DevChannel *
 * Technical Writer --- CheapBytes        */

/* If Linux doesn't have the solution, you have the wrong problem */

-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-dev' in the subject header of the message



More information about the lfs-dev mailing list