AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up locale/Makefile variables for -D switches.

Browse Source
This commit is contained in:
Roland McGrath 2011-08-14 16:08:37 -07:00
parent 5e4287d16f
commit 675456ef83
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2011-08-14 Roland McGrath <roland@hack.frob.com> 2011-08-14 Roland McGrath <roland@hack.frob.com>
* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
(locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
-Iprograms here.
(cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
(localedef-modules): Add localedef.
(locale-modules): Add locale.
* sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const. * sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
* elf/rtld.c (dl_main): Invert order of assignment in last change, * elf/rtld.c (dl_main): Invert order of assignment in last change,
to avoid a warning. to avoid a warning.

22
locale/Makefile
View File

@ -60,10 +60,11 @@ vpath %.c programs ../crypt
vpath %.h programs vpath %.h programs
vpath %.gperf programs vpath %.gperf programs
localedef-modules := $(categories:%=ld-%) charmap linereader locfile \ localedef-modules := localedef $(categories:%=ld-%) \
charmap linereader locfile \
repertoire locarchive repertoire locarchive
localedef-aux := md5 localedef-aux := md5
locale-modules := locale-spec locale-modules := locale locale-spec
lib-modules := charmap-dir simple-hash xmalloc xstrdup lib-modules := charmap-dir simple-hash xmalloc xstrdup
@ -91,22 +92,27 @@ endif
localepath = "$(localedir):$(i18ndir)" localepath = "$(localedir):$(i18ndir)"
locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \ # -Iprograms doesn't really belong here, but this gets it at the head
-DLOCALEDIR='"$(localedir)"' \ # of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
# We need it before the standard -I's to see programs/config.h first.
locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \ -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
-Iprograms
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \ -DLOCSRCDIR='"$(i18ndir)/locales"' \
-Iprograms -DNOT_IN_libc -DHAVE_CONFIG_H -DNOT_IN_libc
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-charmap-dir.c = -Wno-write-strings CFLAGS-charmap-dir.c = -Wno-write-strings
# This makes sure -DNOT_IN_libc is passed for all these modules. # This makes sure -DNOT_IN_libc et al are passed for all these modules.
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \ cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
$(locale-modules) $(lib-modules)) $(locale-modules) $(lib-modules))
lib := nonlib lib := locale-programs
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
# Depend on libc.so so a DT_NEEDED is generated in the shared objects. # Depend on libc.so so a DT_NEEDED is generated in the shared objects.