Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4e7230b11e60375ec975e1e325f66490b5299333)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4e7230b11e60375ec975e1e325f66490b5299333)
  • Date: Mon, 15 Aug 2022 22:18:14 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

libs/glibc/HISTORY | 6 ++++++
libs/glibc/INSTALL | 11 +++++------
libs/glibc/PRE_INSTALL | 7 ++++++-
3 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 4e7230b11e60375ec975e1e325f66490b5299333
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

libs/glibc: improved dynamic loader symlinking on x86_64 systems,
simplified untarring, handle the case when backup'ed ld-linux*
isn't a symlink

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index e2568bc..c1101ad 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2022-08-15 Pavel Vinogradov <public AT sourcemage.org>
+ * INSTALL: further simplified untar operation, symlink for dynamic
loader on
+ x86_64 systems is created in the fake directory and gets copied with
+ the rest stuff
+ * PRE_INSTALL: handle the case when ld-linux* isn't symlink (glibc >
2.33)
+
2022-08-14 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.36, SECURITY_PATCH++, HEADERS_VERSION=5.19,
simplified
gaze call in sanitized kernel headers option
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 6629dc8..558b17d 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -33,13 +33,12 @@ done &&
# install
#
cd "${SOURCE_DIRECTORY}.bld/INSTALL_ROOT" &&
-tar -cf- . | (cd "$INSTALL_ROOT/" && tar -xvf-)
-
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 || ${SMGL_COMPAT_ARCHS[1]} == em64t
]]; then
- [ -d /lib64 -a ! -f /lib64/ld-linux-x86-64.so.2 -a -f
/lib/ld-linux-x86-64.so.2 ] &&
- ln -s $TRACK_ROOT/lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
- true # see bug 8626 for info about this conditional
+if test -d ${TRACK_ROOT}/lib64 && test -f ./lib/ld-linux-x86-64.so.2; then
+ mkdir -p ./lib64 &&
+ ln -sf $TRACK_ROOT/lib/ld-linux-x86-64.so.2 ./lib64/ld-linux-x86-64.so.2
fi &&
+tar -cf- . | tar -C "${INSTALL_ROOT}/" -xvf-
+
( ldconfig || true ) &&

#
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 78f84f4..7debf58 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -14,7 +14,12 @@ if [[ -z $INSTALL_ROOT ]]; then
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)
+ if test -L "$each"; then
+ LD=$(readlink $each)
+ else
+ # glibc > 2.33
+ LD=${each}
+ fi
LDB=${LD##*/}
ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LDB $each
fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4e7230b11e60375ec975e1e325f66490b5299333), Pavel Vinogradov, 08/15/2022

Archive powered by MHonArc 2.6.24.

Top of Page