From 5981afedd13c5a3172980f6e6a47eed9cc77a98d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:28:07 +0000 Subject: [PATCH] Stefan Fiedler: cracklib, shadow: fix build stages and times binutils: install documentation linux: don't copy patch backups readline: build earlier for bash [2007100819314364520] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8773 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/binutils/binutils.conf | 7 +++++++ package/base/cracklib/cracklib.desc | 2 +- package/base/linux/linux.conf | 2 +- package/base/readline/readline.desc | 2 +- package/base/shadow/shadow.desc | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/base/binutils/binutils.conf b/package/base/binutils/binutils.conf index 1f4974238..b783136ca 100644 --- a/package/base/binutils/binutils.conf +++ b/package/base/binutils/binutils.conf @@ -51,6 +51,11 @@ if [ $stagelevel -eq 0 ] ; then --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-sysroot=$CLFS \ --disable-nls" fi +if [ $stagelevel -ge 3 ] ; then + hook_add postmake 3 "eval $MAKE info install-info" + hook_add postmake 3 "eval $MAKE -C gas/doc install-man" +fi + if [ -z "$pkg_binutils_cross" ] ; then # This causes build errors with binutils-cross packages. var_append extraconfopt " " "--enable-shared" @@ -81,6 +86,8 @@ binutils_main() { eval make $makeinstopt + hook_eval postmake + if [ -z "$pkg_binutils_cross" ] ; then cp -v ../binutils-*/include/libiberty.h $root/usr/include/ else diff --git a/package/base/cracklib/cracklib.desc b/package/base/cracklib/cracklib.desc index ab6ffdd6c..b46c901c9 100644 --- a/package/base/cracklib/cracklib.desc +++ b/package/base/cracklib/cracklib.desc @@ -38,7 +38,7 @@ [L] OpenSource [S] Stable [V] 2.8.10 -[P] X --?--5---9 212.300 +[P] X --?-4----9 212.300 [D] 2935843496 cracklib-2.8.10.tar.gz http://dl.sourceforge.net/cracklib/ diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index 4e0072768..5f87b3843 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -516,7 +516,7 @@ main_lx_headers() { for x in $confdir/linux26-hdrs/*.patch; do [ -f $x ] || continue echo "Applying linux userspace headers patch $x.." - ( cd dest/include && patch -p1 < $x; ) + ( cd dest/include && patch -p1 --no-backup-if-mismatch < $x; ) done mkdir -p $CLFS/$prefix/include diff --git a/package/base/readline/readline.desc b/package/base/readline/readline.desc index bc11a9cd6..48bcd5623 100644 --- a/package/base/readline/readline.desc +++ b/package/base/readline/readline.desc @@ -41,7 +41,7 @@ [L] GPL [S] Stable [V] 5.2 -[P] X --X--5---9 102.600 +[P] X --X-4----9 102.600 [D] 3127122673 readline-5.2.tar.gz ftp://ftp.gnu.org/pub/gnu/readline/ diff --git a/package/base/shadow/shadow.desc b/package/base/shadow/shadow.desc index 34fc9839e..24a60e3a2 100644 --- a/package/base/shadow/shadow.desc +++ b/package/base/shadow/shadow.desc @@ -39,7 +39,7 @@ [L] BSD [S] Stable [V] 4.0.14 -[P] X --X--5---9 200.000 +[P] X --X-4----9 213.000 [D] 1814445054 shadow-4.0.14.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/