From e5ac9973e93c96804eb9ed7f865853e522f1baca Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 5 Jan 2011 09:03:28 +0100 Subject: Revert "Makefile.in: Add header to 'all' target" The respective source has to depend on a given set of headers. Depending all on headers is papering over an eventual missing other dependency, so reverting. This reverts commit 4d81f2a74578f819285b131c682e8d2f6c315c4e. --- Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index d7a5fca60..b4dcf6bfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,7 +23,7 @@ export KCONFIG_CONFIG ifeq ($(HAVE_DOT_CONFIG),y) -all: headers pregen libs +all: pregen libs libs: pregen # In this section, we need .config @@ -260,7 +260,6 @@ HEADERS_RM-$(UCLIBC_HAS_WCHAR) += wchar.h wctype.h HEADERS_RM-$(UCLIBC_HAS_WORDEXP) += wordexp.h HEADERS_RM-$(UCLIBC_HAS_XATTR) += sys/xattr.h HEADERS_RM-$(UCLIBC_HAS_XLOCALE) += xlocale.h -HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += sys/fsuid.h sys/inotify.h sys/perm.h \ sys/personality.h \ sys/prctl.h \ -- cgit v1.2.3 From b4a3345ea8f19d7be5d45e183a97f44854fc5998 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 5 Jan 2011 09:06:10 +0100 Subject: remove uClibc_ctype.h if !LOCALE Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index b4dcf6bfd..0a07888f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -241,7 +241,7 @@ HEADERS_RM-$(UCLIBC_HAS_GNU_ERROR) += error.h HEADERS_RM-$(UCLIBC_HAS_GNU_GETOPT)$(UCLIBC_HAS_GETOPT_LONG) += getopt.h HEADERS_RM-$(UCLIBC_HAS_IPV6) += netinet/ip6.h netinet/icmp6.h HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h -HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h +HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h HEADERS_RM-$(UCLIBC_HAS_PTY) += pty.h HEADERS_RM-$(UCLIBC_HAS_REALTIME) += mqueue.h bits/mqueue.h sched.h \ bits/sched.h \ -- cgit v1.2.3 From 6a171a2bfc2326e57501c9e50bc28f0a8f820252 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Thu, 6 Jan 2011 08:28:34 +0100 Subject: buildsys: fix make release target According to git man page the syntax for git archive should have the as last argument. Indeed using git 1.5.5.6 the tarball was not properly created. Newer version (i.e. 1.6.3.3) works fine even if HEAD comes before other option. For backward compatibility use a syntax that is fine with older git. Signed-off-by: Carmelo Amoroso --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 0a07888f0..ecb9cd994 100644 --- a/Makefile.in +++ b/Makefile.in @@ -475,7 +475,7 @@ distclean: clean dist release: $(RM) ../uClibc-$(VERSION).tar - git archive HEAD --format=tar --prefix=uClibc-$(VERSION)/ \ + git archive --format=tar --prefix=uClibc-$(VERSION)/ HEAD \ > ../uClibc-$(VERSION).tar cat ../uClibc-$(VERSION).tar | bzip2 -c9 > ../uClibc-$(VERSION).tar.bz2 cat ../uClibc-$(VERSION).tar | xz -e -c8 > ../uClibc-$(VERSION).tar.xz -- cgit v1.2.3 From 8764f2e75c875757529aa81e5cd96e17e6f6e5e4 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 5 Jan 2011 14:38:13 +0100 Subject: buildsys: headers target should not depend on sysnum.h The generation of the sysnum.h has to be a prerequisite of 'pregen' target instead of headers, because it needs the compiler already available. The so called C bootstrap headers are required to build the compiler by invoking 'make headers', so the 'headers' target cannot relies itself on the compiler to be invoked. Signed-off-by: Carmelo Amoroso --- Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index ecb9cd994..ab5ab7286 100644 --- a/Makefile.in +++ b/Makefile.in @@ -158,11 +158,12 @@ headers_clean-y += HEADERCLEAN_common # libc/sysdeps/linux/Makefile.commonarch to headers-y headers-y += $(target-headers-sysdep) -headers: $(top_builddir)include/bits/uClibc_config.h $(top_builddir)include/bits/sysnum.h | subdirs +headers: $(top_builddir)include/bits/uClibc_config.h | subdirs subdirs: $(addprefix $(top_builddir),$(subdirs)) -pregen-headers: $(pregen-headers-y) +pregen-headers: $(top_builddir)include/bits/sysnum.h $(pregen-headers-y) pregen: pregen-headers $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers) + $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh | $(top_builddir)include/bits @$(disp_gen) $(Q)set -e; \ -- cgit v1.2.3