glibc: Drop 0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch

This patch was originally added to replace pwd-derived paths in glibc test binaries with
fixed Yocto paths (e.g., $(oe_srcdir), $(libdir)/glibc-tests/ptest/tests/glibc-ptest) to
fix the repro issue with run-ptest script(no longer exists in master).

In the current master:
run-ptest script and the glibc-y2038-tests recipe were dropped via the following commit
https://git.openembedded.org/openembedded-core/commit/meta?id=fbe3679ba3c12c52a502511f5dde91fb4de7a6b6
Glibc tests now run via check-test-wrapper, which dynamically configures environment,
sysroot, and library paths. The hardcoded paths from this patch conflict with dynamic
path resolution, causing some tests to fail like

error: xdlmopen.c:28: error: dlmopen:/usr/lib/glibc-tests/ptest/tests/glibc-ptest/*:
cannot open shared object file:No such file or directory

Reproducibility is confirmed to remain intact without this patch. Since it no longer provides
benefits and interferes with correct test execution, the patch is being dropped.

Testing results:

            before   after   diff
PASS         6937     6943     +6
XPASS           4        4      0
FAIL           72       66     -6
XFAIL          16       16      0
UNSUPPORTED   108      108      0

Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch b/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch
deleted file mode 100644 (file)
index 9fa5d47..0000000
--- a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 662d544fbed823b9bf917058762ddb54bcee5f07 Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Sun, 24 Jul 2022 07:07:29 -0700
-Subject: [PATCH] Avoid hardcoded build time paths in the output binaries
-
-replace the compile definitions with the output locations.
-
-Upstream-Status: Inappropriate [would need reworking somehow to be acceptable upstream]
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- support/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/support/Makefile b/support/Makefile
-index d41278eeab..657769418e 100644
---- a/support/Makefile
-+++ b/support/Makefile
-@@ -238,9 +238,9 @@ libsupport-inhibit-o += .o
- endif
- 
- CFLAGS-support_paths.c = \
--              -DSRCDIR_PATH=\"`cd .. ; pwd`\" \
--              -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
--              -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
-+              -DSRCDIR_PATH=\"$(oe_srcdir)\" \
-+              -DOBJDIR_PATH=\"$(libdir)/glibc-tests/ptest/tests/glibc-ptest\" \
-+              -DOBJDIR_ELF_LDSO_PATH=\"$(slibdir)/$(rtld-installed-name)\" \
-               -DINSTDIR_PATH=\"$(prefix)\" \
-               -DLIBDIR_PATH=\"$(libdir)\" \
-               -DBINDIR_PATH=\"$(bindir)\" \

diff --git a/meta/recipes-core/glibc/glibc_2.42.bb b/meta/recipes-core/glibc/glibc_2.42.bb
index f9c1cdc2f14561747813e0f77b4a6546090649c3..b33d1b44ba3fcff66b5d5d15bfbd4333811533c4 100644 (file)
--- a/meta/recipes-core/glibc/glibc_2.42.bb
+++ b/meta/recipes-core/glibc/glibc_2.42.bb
@@ -51,7 +51,6 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \
            file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \
            file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
-           file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \
            file://0023-tests-Skip-2-qemu-tests-that-can-hang-in-oe-selftest.patch \
            file://0024-Propagate-ffile-prefix-map-from-CFLAGS-to-ASFLAGS.patch \
 "