[git commit] buildsys: pregen depends on xlocale

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Apr 29 21:52:18 UTC 2015


commit: http://git.uclibc.org/uClibc/commit/?id=5b691e38f45e3fed19aea98775f79ab9cc00783f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

pt-initfini eventually depends on xlocale

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Makefile.in                                 |    2 +-
 extra/locale/Makefile.in                    |    8 +++-----
 libpthread/nptl/sysdeps/pthread/Makefile.in |    2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3bee8f6..04671a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ headers:
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
+include $(top_srcdir)extra/locale/Makefile.in
 include $(top_srcdir)ldso/Makefile.in
 include $(top_srcdir)libcrypt/Makefile.in
 include $(top_srcdir)libintl/Makefile.in
@@ -39,7 +40,6 @@ include $(top_srcdir)libutil/Makefile.in
 include $(top_srcdir)libpthread/Makefile.in
 include $(top_srcdir)librt/Makefile.in
 include $(top_srcdir)libubacktrace/Makefile.in
-include $(top_srcdir)extra/locale/Makefile.in
 
 # last included to catch all the objects added by others (locales/threads)
 include $(top_srcdir)libc/Makefile.in
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
index 7ec9f53..efd07ed 100644
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@@ -29,7 +29,8 @@ BUILD_CFLAGS-gen_collate := -D_GNU_SOURCE
 
 locale_headers-$(UCLIBC_HAS_LOCALE) := $(top_builddir)include/bits/uClibc_locale_data.h
 
-#DEPH-locale := $(top_builddir)include/bits/sysnum.h
+headers_dep += $(locale_headers-y)
+
 DEPH-locale := $(top_builddir)include/bits/uClibc_config.h
 DEPH-gen_collate := $(DEPH-locale)
 DEPH-gen_ldc := $(addprefix $(locale_OUT)/,c8tables.h wctables.h locale_tables.h locale_collate.h) $(DEPH-locale)
@@ -46,9 +47,6 @@ locale_OBJ := $(locale_OUT)/locale_data.o
 
 CFLAGS-locale_data.c := -D__WCHAR_ENABLED -I$(locale_OUT) -I$(locale_DIR)
 
-headers_dep += $(locale_headers-y)
-headers: $(locale_headers-y)
-
 libc-$(UCLIBC_HAS_LOCALE) += $(locale_OBJ)
 libc-nomulti-$(UCLIBC_HAS_LOCALE) += $(locale_OBJ)
 
@@ -68,7 +66,7 @@ $(locale_OUT)%.s:  $(locale_OUT)%.S FORCE ; $(compile.s)
 $(locale_OUT)%.dep:
 
 
-locale_headers: $(top_builddir)include/bits/uClibc_locale_data.h
+locale_headers: $(locale_headers-y)
 
 # make sure that the host system has locales (this check is ok for uClibc/glibc)
 # we do not know though which locales were really enabled for libc at build time
diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
index 84adfe0..849c75f 100644
--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
+++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
@@ -78,7 +78,7 @@ $(libpthread_pthread_OUT)/pt-crti.o: $(libpthread_pthread_OUT)/pt-crti.S
 $(libpthread_pthread_OUT)/pt-crtn.o: $(libpthread_pthread_OUT)/pt-crtn.S
 	$(compile.S)
 
-$(libpthread_pthread_OUT)/pt-initfini.s: $(PTHREAD_INITFINI) | $(top_builddir)include/bits/uClibc_config.h
+$(libpthread_pthread_OUT)/pt-initfini.s: $(PTHREAD_INITFINI) | $(headers_dep)
 	$(compile.c)
 $(libpthread_pthread_OUT)/defs.h: $(PTHREAD_INITFINI)
 	$(do_sed) -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \


More information about the uClibc-cvs mailing list