← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to stdio-common/Makefile

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
stdio-common/Makefile
1
 
# Copyright (C) 1991-2009, 2011, 2012 Free Software Foundation, Inc.
 
1
# Copyright (C) 1991-2012 Free Software Foundation, Inc.
2
2
# This file is part of the GNU C Library.
3
3
 
4
4
# The GNU C Library is free software; you can redistribute it and/or
63
63
         tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
64
64
         tst-fwrite bug16 bug17 tst-sprintf2 bug18 \
65
65
         bug19 tst-popen2 scanf14 scanf15 bug21 bug22 scanf16 scanf17 \
66
 
         tst-setvbuf1 bug23 bug23-2 bug23-3 bug24 bug-vfprintf-nargs tst-sprintf3 bug25
 
66
         tst-setvbuf1 bug23 bug23-2 bug23-3 bug24 bug-vfprintf-nargs tst-sprintf3 bug25 \
 
67
         tst-printf-round
67
68
tests-$(OPTION_EGLIBC_LOCALE_CODE) \
68
69
      += tst-sscanf tst-swprintf test-vfprintf bug14 scanf13 tst-grouping
69
70
tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \
75
76
 
76
77
include ../Rules
77
78
 
78
 
# eglibc: ifeq ($(cross-compiling),no)
 
79
ifeq ($(run-built-tests),yes)
79
80
.PHONY: do-tst-unbputc do-tst-printf
80
81
tests: do-tst-unbputc do-tst-printf
81
82
 
82
83
do-tst-unbputc: $(objpfx)tst-unbputc.out
83
 
$(objpfx)tst-unbputc.out: $(objpfx)tst-unbputc tst-unbputc.sh
84
 
        $(SHELL) -e tst-unbputc.sh $(common-objpfx) '$(run-program-prefix)'
 
84
$(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
 
85
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
85
86
 
86
87
do-tst-printf: $(objpfx)tst-printf.out
87
 
$(objpfx)tst-printf.out: $(objpfx)tst-printf tst-printf.sh
88
 
        $(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
89
 
# eglibc: endif
 
88
$(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf
 
89
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
 
90
endif
90
91
 
91
92
CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
92
93
CFLAGS-vfwprintf.c = -Wno-uninitialized
136
137
bug14-ENV = LOCPATH=$(common-objpfx)localedata
137
138
tst-grouping-ENV = LOCPATH=$(common-objpfx)localedata
138
139
 
139
 
ifneq (,$(filter %REENTRANT, $(defines)))
140
 
CPPFLAGS += -D_IO_MTSAFE_IO
141
 
endif
 
140
CPPFLAGS += $(libio-mtsafe)
142
141
 
143
142
$(objpfx)tst-setvbuf1.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1
144
143
        $(built-program-cmd) > $@ 2>&1
145
144
        cmp tst-setvbuf1.expect $@
 
145
 
 
146
ifeq ($(build-shared),yes)
 
147
link-libm = $(common-objpfx)math/libm.so
 
148
else
 
149
link-libm = $(common-objpfx)math/libm.a
 
150
endif
 
151
$(objpfx)tst-printf-round: $(link-libm)