diff options
-rw-r--r-- | meta/recipes-core/glibc/glibc-tests_2.35.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc/reproducible-paths.patch | 23 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-tests_2.35.bb b/meta/recipes-core/glibc/glibc-tests_2.35.bb index 028e83e865..96d0569ff6 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.35.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.35.bb | |||
@@ -5,6 +5,7 @@ inherit ptest features_check | |||
5 | REQUIRED_DISTRO_FEATURES = "ptest" | 5 | REQUIRED_DISTRO_FEATURES = "ptest" |
6 | 6 | ||
7 | SRC_URI:append = " \ | 7 | SRC_URI:append = " \ |
8 | file://reproducible-paths.patch \ | ||
8 | file://run-ptest \ | 9 | file://run-ptest \ |
9 | " | 10 | " |
10 | 11 | ||
@@ -31,6 +32,8 @@ RRECOMMENDS:${PN} = "" | |||
31 | RDEPENDS:${PN} = " glibc sed" | 32 | RDEPENDS:${PN} = " glibc sed" |
32 | DEPENDS:append = " sed" | 33 | DEPENDS:append = " sed" |
33 | 34 | ||
35 | export oe_srcdir="${exec_prefix}/src/debug/glibc/${PV}/" | ||
36 | |||
34 | # Just build tests for target - do not run them | 37 | # Just build tests for target - do not run them |
35 | do_check:append () { | 38 | do_check:append () { |
36 | oe_runmake -i check run-built-tests=no | 39 | oe_runmake -i check run-built-tests=no |
diff --git a/meta/recipes-core/glibc/glibc/reproducible-paths.patch b/meta/recipes-core/glibc/glibc/reproducible-paths.patch new file mode 100644 index 0000000000..0754dca62b --- /dev/null +++ b/meta/recipes-core/glibc/glibc/reproducible-paths.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Avoid hardcoded build time paths in the output binaries by replacing the compile | ||
2 | definitions with the output locations. | ||
3 | |||
4 | Upstream-Status: Inappropriate [would need reworking somehow to be acceptable upstream] | ||
5 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
6 | |||
7 | Index: git/support/Makefile | ||
8 | =================================================================== | ||
9 | --- git.orig/support/Makefile | ||
10 | +++ git/support/Makefile | ||
11 | @@ -216,9 +216,9 @@ libsupport-inhibit-o += .o | ||
12 | endif | ||
13 | |||
14 | CFLAGS-support_paths.c = \ | ||
15 | - -DSRCDIR_PATH=\"`cd .. ; pwd`\" \ | ||
16 | - -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \ | ||
17 | - -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ | ||
18 | + -DSRCDIR_PATH=\"$(oe_srcdir)\" \ | ||
19 | + -DOBJDIR_PATH=\"$(libdir)/glibc-tests/ptest/tests/glibc-ptest\" \ | ||
20 | + -DOBJDIR_ELF_LDSO_PATH=\"$(slibdir)/$(rtld-installed-name)\" \ | ||
21 | -DINSTDIR_PATH=\"$(prefix)\" \ | ||
22 | -DLIBDIR_PATH=\"$(libdir)\" \ | ||
23 | -DBINDIR_PATH=\"$(bindir)\" \ | ||