Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 56ae260ac24ade94e2e0e77c81751312372d253f 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] localedef: 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/Makefile.in b/Makefile.in |
| 17 | index 77fbded..a87e5b2 100644 |
| 18 | --- a/Makefile.in |
| 19 | +++ b/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 |