From bf147be49d38e8dd0dd0673ebf662a9c51d1ba41 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 11 Feb 2008 14:50:05 +0200 Subject: [PATCH] Removed x86-64 specific glibc postconfig where we implemented our old multilib support (obsolete) --- architecture/x86-64/pkg_glibc_post.conf | 53 ------------------------- 1 file changed, 53 deletions(-) delete mode 100644 architecture/x86-64/pkg_glibc_post.conf diff --git a/architecture/x86-64/pkg_glibc_post.conf b/architecture/x86-64/pkg_glibc_post.conf deleted file mode 100644 index bcdcb8b..0000000 --- a/architecture/x86-64/pkg_glibc_post.conf +++ /dev/null @@ -1,53 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: architecture/x86-64/pkg_glibc_post.conf -# Copyright (C) 2007 - 2010 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -pkg_glibc32_preconf(){ - if [ $buildloop -eq 1 ]; then - # after finishing buildloop 1 we have to get back to the - # toplevel source directory - hook_add postmake 9 'cd .. ; pwd' - fi - - if [ $buildloop -eq 2 ]; then - echo_status "Building 32 Bit Libraries (Multilib support enabled)" - # we need -m32 ... - still needed? - var_insert GCC_WRAPPER_INSERT " " "-m32 -march=i686" - - arch_target="`echo $arch_target | arch2arch32`" - echo_status "Setting arch_target to $arch_target" - set_confopt - # do not build the programs - hook_add premake 5 "cat > configparms <<-EOT -build-programs=no -EOT -" - - libdir=${libdir%64}32 - slibdir=lib32 - - var_remove makeinstopt ' ' 'install' - var_append makeinstopt ' ' 'install-lib-all' - - # glibc installs some headers it should not - var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*usr/include/.*\.h,/tmp/weg.h,'" - fi -} - -if [ "$SDECFG_MULTILIB" = 1 ]; then - if ! atstage toolchain; then - buildloops=2 - fi - - hook_add preconf 5 "pkg_glibc32_preconf" -fi