GNU C Library master sources branch master updated. glibc-2.16-ports-merge-321-gbcba7aa

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  bcba7aa24d91c348e6669ffa3d287bd3d927fd62 (commit)
      from  06585ee8da2c3a30fc7f5e0a42d26adcb3a72e94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bcba7aa24d91c348e6669ffa3d287bd3d927fd62

commit bcba7aa24d91c348e6669ffa3d287bd3d927fd62
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Sep 10 11:13:54 2012 -0700

    Run tst-fopenloc if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index c2bd4f0..c26b7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-09-10  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* libio/Makefile: Include ../Makeconfig before tests.
+	(tests): Add tst-fopenloc and depend on $(objpfx)tst-fopenloc.check
+	only if $(build-shared) is yes.
+
+2012-09-10  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* iconv/gconv_db.c: Update copyright years.
 
 2012-09-10  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>
diff --git a/libio/Makefile b/libio/Makefile
index c555dd0..090e194 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -46,8 +46,10 @@ routines	:=							      \
 									      \
 	libc_fatal fmemopen
 
+include ../Makeconfig
+
 tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
-	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 tst-fopenloc \
+	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \
 	tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf	      \
 	tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof          \
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
@@ -58,12 +60,15 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst-wmemstream1 tst-wmemstream2 \
 	bug-memstream1 bug-wmemstream1 \
 	tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos bug-fclose1
+ifeq (yes,$(build-shared))
+# Add test-fopenloc only if shared library is enabled since it depends on
+# shared localedata objects.
+tests += tst-fopenloc
+endif
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
 
-include ../Makeconfig
-
 ifeq ($(versioning),yes)
 routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \
 	    oldtmpfile oldiofgetpos oldiofgetpos64 oldiofsetpos	    \
@@ -170,7 +175,12 @@ shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
 include ../Rules
 
 ifeq (no,$(cross-compiling))
-tests: $(objpfx)test-freopen.out $(objpfx)tst-fopenloc.check
+tests: $(objpfx)test-freopen.out
+ifeq (yes,$(build-shared))
+# Run tst-fopenloc.check only if shared library is enabled since it
+# depends on tst-fopenloc.out.
+tests: $(objpfx)tst-fopenloc.check
+endif
 endif
 
 $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    6 ++++++
 libio/Makefile |   18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources