2 Commits

Author SHA1 Message Date
  Christian Wiese 4b8b150398 Removed x86-64 specific glibc postconfig where we implemented our old multilib support (obsolete) 18 years ago
  Alejandro Mery 37cdffd581 docker: always run ./debug.sh as root 5 years ago
2 changed files with 3 additions and 53 deletions
Unified View
  1. +0
    -53
      architecture/x86-64/pkg_glibc_post.conf
  2. +3
    -0
      docker/run.sh

+ 0
- 53
architecture/x86-64/pkg_glibc_post.conf

@ -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

+ 3
- 0
docker/run.sh

@ -79,6 +79,9 @@ if [ $# -gt 0 ]; then
;; ;;
esac esac
;;
*/debug.sh)
USER_NEEDS_SUDO=true
;; ;;
esac esac
;; ;;

Loading…
Cancel
Save