diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-12-07 10:40:41 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:25:41 +0000 |
commit | e14ccae9efa17747160a8010b3cdf9617721788e (patch) | |
tree | d64b74380314f20d8aa94adc26019f4076ae3e73 /meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch | |
parent | 73be2c3b351bf24b6c2634a9d6db4ed49e3a402b (diff) | |
download | poky-e14ccae9efa17747160a8010b3cdf9617721788e.tar.gz |
cross-localedef: Re-arrange patches
Patches are currently, crossing across repo boundaries, between glibc
and localedef, therefore it is better to divide the patches
accordiningly, with this patchset makery patch is spun out since that
applies to localedef alone.
There are no other code changes
(From OE-Core rev: 85b86bc810dcde3357d681ca8043883f2f4fdba0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch b/meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch new file mode 100644 index 0000000000..e87a3bfb6f --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0031-Add-hardlink-resolver-to-build.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From 1ef58f566e6ed575f7caee35308025e2b0f4101c Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
3 | Date: Sat, 7 Dec 2019 09:56:23 -0800 | ||
4 | Subject: [PATCH] Add hardlink resolver to build | ||
5 | |||
6 | The sourcecode for this is imported from util-linux and is kept with | ||
7 | glibc sources | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Makefile.in | 8 +++++++- | ||
14 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/localedef/Makefile.in b/localedef/Makefile.in | ||
17 | index 77fbded..a87e5b2 100644 | ||
18 | --- a/localedef/Makefile.in | ||
19 | +++ b/localedef/Makefile.in | ||
20 | @@ -40,6 +40,8 @@ WARNFLAGS = -Wall -Wno-format | ||
21 | FULLCC = $(CC) $(CPPFLAGS) $(CFLAGS) \ | ||
22 | $(DEFINES) $(INCLUDES) $(WARNFLAGS) | ||
23 | |||
24 | +CROSS_LOCALEDEF_HARDLINK_OBJS = cross-localedef-hardlink.o | ||
25 | + | ||
26 | LOCALEDEF_OBJS = charmap.o charmap-dir.o ld-address.o ld-collate.o \ | ||
27 | ld-ctype.o ld-identification.o ld-measurement.o \ | ||
28 | ld-messages.o ld-monetary.o ld-name.o ld-numeric.o \ | ||
29 | @@ -54,11 +56,14 @@ LOCALEDEF_OBJS = charmap.o charmap-dir.o ld-address.o ld-collate.o \ | ||
30 | asprintf.o getdelim.o localedef_extra.o \ | ||
31 | obstack_printf.o vasprintf.o | ||
32 | |||
33 | -all: localedef$(EXEEXT) | ||
34 | +all: localedef$(EXEEXT) cross-localedef-hardlink$(EXEEXT) | ||
35 | |||
36 | localedef$(EXEEXT): $(LOCALEDEF_OBJS) | ||
37 | $(CC) -o $@ $(LOCALEDEF_OBJS) $(LIBS) | ||
38 | |||
39 | +cross-localedef-hardlink$(EXEEXT): $(CROSS_LOCALEDEF_HARDLINK_OBJS) | ||
40 | + $(CC) -o $@ $(CROSS_LOCALEDEF_HARDLINK_OBJS) $(LIBS) | ||
41 | + | ||
42 | clean: | ||
43 | rm -f locale$(EXEEXT) $(LOCALEDEF_OBJS) | ||
44 | |||
45 | @@ -77,6 +82,7 @@ clean: | ||
46 | %.o: $(srcdir)/%.c | ||
47 | $(FULLCC) -c -o $@ $< | ||
48 | |||
49 | +cross-localedef-hardlink.o: glibc/locale/programs/cross-localedef-hardlink.c | ||
50 | charmap.o: glibc/locale/programs/charmap.c | ||
51 | charmap-dir.o: glibc/locale/programs/charmap-dir.c | ||
52 | ld-address.o: glibc/locale/programs/ld-address.c | ||
53 | -- | ||
54 | 2.24.0 | ||
55 | |||