diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-06 23:21:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-08 20:22:11 +0000 |
commit | bbfe982f9f1dd28af3c814097d6277616e2dcfb8 (patch) | |
tree | 6a396e94cc464806ba4f6f664a21f3e5fa5d9ca5 /meta | |
parent | 000f71e0f7cc13fe850b067c708b969e4fb0d1b4 (diff) | |
download | poky-bbfe982f9f1dd28af3c814097d6277616e2dcfb8.tar.gz |
glibc: Drop patch for obsolete conflict issue
We're no longer patching files called "libm-test-ulps" so this patch isn't
really needed. Regardless, if we were, we should fix the real issue in the
upstream code which may have already happened. Drop this patch.
(From OE-Core rev: aef530a2d805c287c25ea8b4715602955e892ec9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch | 33 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.34.bb | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch deleted file mode 100644 index 474cea5a0d..0000000000 --- a/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From c5047b8f7d1a17324cfa02b99f07a70ebcec2cf2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ting Liu <b28495@freescale.com> | ||
3 | Date: Wed, 19 Dec 2012 04:39:57 -0600 | ||
4 | Subject: [PATCH] eglibc: run libm-err-tab.pl with specific dirs in ${S} | ||
5 | |||
6 | libm-err-tab.pl will parse all the files named "libm-test-ulps" | ||
7 | in the given dir recursively. To avoid parsing the one in | ||
8 | ${S}/.pc/ (it does exist after eglibc adds aarch64 support, | ||
9 | ${S}/.pc/aarch64-0001-glibc-fsf-v1-eaf6f205.patch/ports/sysdeps/ | ||
10 | aarch64/libm-test-ulps), run libm-err-tab.pl with specific dirs | ||
11 | in ${S}. | ||
12 | |||
13 | Upstream-Status: Inappropriate [OE specific] | ||
14 | |||
15 | Signed-off-by: Ting Liu <b28495@freescale.com> | ||
16 | --- | ||
17 | manual/Makefile | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/manual/Makefile b/manual/Makefile | ||
21 | index e83444341e..aa2645bc55 100644 | ||
22 | --- a/manual/Makefile | ||
23 | +++ b/manual/Makefile | ||
24 | @@ -103,7 +103,8 @@ $(objpfx)stamp-libm-err: $(..)math/gen-libm-test.py \ | ||
25 | $(wildcard $(foreach dir,$(sysdirs),\ | ||
26 | $(dir)/libm-test-ulps)) | ||
27 | pwd=`pwd`; \ | ||
28 | - $(PYTHON) $< -s $$pwd/.. -m $(objpfx)libm-err-tmp | ||
29 | + $(PYTHON) $< -s $$pwd/../ports -m $(objpfx)libm-err-tmp | ||
30 | + $(PYTHON) $< -s $$pwd/../sysdeps -m $(objpfx)libm-err-tmp | ||
31 | $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi | ||
32 | touch $@ | ||
33 | |||
diff --git a/meta/recipes-core/glibc/glibc_2.34.bb b/meta/recipes-core/glibc/glibc_2.34.bb index 2f3065484d..cdce2c4112 100644 --- a/meta/recipes-core/glibc/glibc_2.34.bb +++ b/meta/recipes-core/glibc/glibc_2.34.bb | |||
@@ -34,7 +34,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ | |||
34 | file://makedbs.sh \ | 34 | file://makedbs.sh \ |
35 | \ | 35 | \ |
36 | ${NATIVESDKFIXES} \ | 36 | ${NATIVESDKFIXES} \ |
37 | file://0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ | ||
38 | file://0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ | 37 | file://0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ |
39 | file://0016-yes-within-the-path-sets-wrong-config-variables.patch \ | 38 | file://0016-yes-within-the-path-sets-wrong-config-variables.patch \ |
40 | file://0017-timezone-re-written-tzselect-as-posix-sh.patch \ | 39 | file://0017-timezone-re-written-tzselect-as-posix-sh.patch \ |