Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 libs/glibc/DETAILS     |    2 +-
 libs/glibc/HISTORY     |    5 -----
 libs/glibc/INSTALL     |   26 +++++++++++++++++++++++---
 libs/glibc/PRE_INSTALL |   47 ++++++++++++++++++++++++++++++++++-------------
 4 files changed, 58 insertions(+), 22 deletions(-)

New commits:
commit 03041b2659aeaa0077bf4776f85a8c8e8f679342
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    Revert "glibc - staging now works"
    
    This reverts commit f686a6d1c63365006bb24355be78a78e51d45521.
    
    No it doesn't. Building glibc in the November 2018 chroot bombs. It
    installs /lib/ld-2.29.so, redirects the ld-linux-x86-64.so symlink to it
    and then brings down the entire system with segfaults on everything.

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index ee6caa7..068b6a3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -99,7 +99,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=LGPL
       LICENSE[1]=LGPL
       LICENSE[2]=GPL
-#  STAGED_INSTALL=off
+  STAGED_INSTALL=off
          ENTERED=20010922
         KEYWORDS="libs"
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index cb0a061..eefabfa 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -4,11 +4,6 @@
 2019-03-04 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: added support for 5.x kernels
 
-2019-02-23 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: enable staging
-       * PRE_INSTALL: protect special libs, simplify
-       * INSTALL: simplify, remove unneeded checks when staging
-
 2019-02-21 Treeve Jelbert <treeve AT sourcemage.org>
        * BUILD: remove lots of commented code
 
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 5fbd548..2e9fdc0 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -5,10 +5,30 @@
 install  -d  ${INSTALL_ROOT}/usr/include  &&
 cd  $GLIBC_HEADERS_DIR/usr/include        &&
 
-message "${MESSAGE_COLOR}Installing glibc linux headers${DEFAULT_COLOR}" &&
-cp -a ./*  ${INSTALL_ROOT}/usr/include    &&
+echo  "installing glibc linux headers"               &&
+for dir in *
+do
+  install  -d  ${INSTALL_ROOT}/usr/include/$dir       &&
+  cp  -fa  $dir/*  ${INSTALL_ROOT}/usr/include/$dir 
+done &&
 
 cd $SOURCE_DIRECTORY.bld  &&
+
+#
+# glibc only installs these if the file differs
+#
+for  i  in  ${INSTALL_ROOT}/usr/include/bits/syscall.h  \
+            ${INSTALL_ROOT}/usr/include/gnu/stubs.h     \
+            ${INSTALL_ROOT}/usr/include/gnu/stubs-32.h  \
+            ${INSTALL_ROOT}/usr/include/gnu/stubs-64.h; do
+  if  [  -f  $i  ];  then
+    rm  -vf  $i
+  fi
+done  &&
+#
+# End syscall.h and stubs.h fix
+#
+
 #
 # install
 #
@@ -35,4 +55,4 @@ fi &&
 install_config_file  $SOURCE_DIRECTORY/nscd/nscd.conf  \
   $INSTALL_ROOT/etc/nscd.conf &&
 
-ln -sfn ${TRACK_ROOT}/usr/include/locale.h 
"${INSTALL_ROOT}/usr/include/xlocale.h"
+ln -sfn /usr/include/locale.h "${INSTALL_ROOT}/usr/include/xlocale.h"
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 827f749..78f84f4 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -1,19 +1,40 @@
-source $GRIMOIRE/protect_special_libs &&
+lock_resources "libgrimoire" "install"  &&
 if [[ -z $INSTALL_ROOT ]]; then
-  protect_special_libs
-  local LD LDB &&
-# there may be several ld-linux* to protect
-  for each in /lib{,64,32}/ld-linux* $PROTECT/ld-linux*; do
+  mkdir $SOURCE_DIRECTORY.bld/old.libs  &&
+  message "${MESSAGE_COLOR}copying old libraries${DEFAULT_COLOR}" &&
+  local each  &&
+  for each in /lib{,64,32}/*; do
     if test -f "$each"; then
-      message "${MESSAGE_COLOR}Adjusting $each${DEFAULT_COLOR}" &&
-      LD=$(readlink $each) &&
-      LDB=${LD##*/}  &&
-      ln -sf $PROTECT/$LDB $each
-#       ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LDB $each
+      cp -a "$each" $SOURCE_DIRECTORY.bld/old.libs
+    fi
+  done  &&
+  message "${MESSAGE_COLOR}Runnning ldconfig${DEFAULT_COLOR}" &&
+  ldconfig $SOURCE_DIRECTORY.bld/old.libs  &&
+  local LD  &&
+  message "${MESSAGE_COLOR}changing ld-linux${DEFAULT_COLOR}" &&
+  for each in /lib{,64,32}/ld-linux*; do
+    if test -f "$each"; then
+      LD=$(readlink $each)
+      LDB=${LD##*/}
+      ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LDB $each
      fi
   done
 fi  &&
 
-# message "${MESSAGE_COLOR}Dispelling glibc${DEFAULT_COLOR}" &&
-do_dispel
-# old symlinks not relevant if staging
+message "${MESSAGE_COLOR}Dispelling glibc${DEFAULT_COLOR}" &&
+if  spell_ok  glibc;  then
+  dispel  --notriggers  --nosustain  glibc
+fi  &&
+
+message "${MESSAGE_COLOR}cleaning old symlinks${DEFAULT_COLOR}" &&
+# clean up symlinks that break stuff, we used to install those
+if [[ -h  $INSTALL_ROOT/usr/include/asm ]]; then
+  rm -f $INSTALL_ROOT/usr/include/asm
+fi  &&
+if [[ -h  $INSTALL_ROOT/usr/include/asm-generic ]]; then
+  rm -f $INSTALL_ROOT/usr/include/asm-generic
+fi  &&
+if [[ -h  $INSTALL_ROOT/usr/include/linux ]]; then
+  rm -f $INSTALL_ROOT/usr/include/linux
+fi &&
+true