From 973c363a64e657e9f18510ba66b8bb03cb10cf9c Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 14 Feb 2008 03:48:01 +0200 Subject: [PATCH] Changed glibc to call its 'general' postmake function just while building the default ABI --- base/glibc/glibc.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf index b90de0c2f..5566e958d 100644 --- a/base/glibc/glibc.conf +++ b/base/glibc/glibc.conf @@ -78,6 +78,11 @@ pkg_glibc_abi_preconf() { # filter out some unwanted header files var_append INSTALL_WRAPPER_FILTER "|" \ "sed -e 's,.*usr/include/.*\.h,/tmp/removed.h,'" + else + # only run postmake while building the default ABI + if atstage native; then + hook_add postmake 5 'pkg_glibc_postmake' + fi fi } @@ -182,7 +187,7 @@ glibc_install_locales() { /bin/sh $root$bindir/locale-gen } -glibc_postmake() { +pkg_glibc_postmake() { if atstage toolchain; then cp -v ../include/features.h $root$includedir mkdir -p $root$includedir/{bits,gnu} @@ -293,8 +298,6 @@ if atstage toolchain; then makeinstopt="-k cross-compiling=yes install-headers" fi -hook_add postmake 5 "glibc_postmake" - # workaround for failing builds when building for i686 cpu family case $arch_machine in i686) var_append extraconfopt ' ' "--disable-multi-arch" ;;