From 82808d1b147e8a3fdd606c7c64da9c39057b5a0f Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 4 Nov 2014 12:57:31 +0000 Subject: [PATCH] Fixes addition of "pass1" util-linux in new version of CLFS. Thanks to William Harrington for the patch. --- CLFS/master.sh | 3 ++- common/libs/func_wrt_Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CLFS/master.sh b/CLFS/master.sh index dd6edbf..d0d7628 100644 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -148,7 +148,8 @@ cross_tools_Makefiles() { # -e 's@-static@@' \ -e 's@-final@@' \ -e 's@-64@@' \ - -e 's@-n32@@'` + -e 's@-n32@@' \ + -e 's@-pass1@@'` pkg_tarball=$(get_package_tarball_name $name) #--------------------------------------------------------------------# diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile index c8179b9..dad9bce 100644 --- a/common/libs/func_wrt_Makefile +++ b/common/libs/func_wrt_Makefile @@ -98,7 +98,7 @@ get_package_tarball_name() { # ;; libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; - util-linux-libs) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 ) + util-linux-libs | util-linux-pass1) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;