← Back to branch summary

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

« back to all changes in this revision

Viewing changes to 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:
Makefile
194
194
else
195
195
installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
196
196
 
197
 
$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
 
197
$(inst_includedir)/gnu/stubs.h: $(+force)
198
198
        $(make-target-directory)
199
199
        { \
200
200
         echo '/* This file is automatically generated.';\
292
292
 
293
293
tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
294
294
ifneq ($(CXX),no)
295
 
check-data := $(firstword $(wildcard \
296
 
                $(foreach D,$(add-ons) scripts,\
297
 
                          $(patsubst %,$D/data/c++-types-%.data,\
298
 
                                     $(abi-name) \
299
 
                                     $(addsuffix -$(config-os),\
300
 
                                                 $(config-machine) \
301
 
                                                 $(base-machine))))))
302
 
ifneq (,$(check-data))
303
 
$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
 
295
 
 
296
vpath c++-types.data $(+sysdep_dirs)
 
297
 
 
298
$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
304
299
        scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
305
 
else
306
 
$(objpfx)c++-types-check.out:
307
 
        @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
308
 
        @echo "not run" > $@
309
 
endif
310
300
endif
311
301
 
312
302
$(objpfx)check-local-headers.out: scripts/check-local-headers.sh
427
417
        fi
428
418
endif
429
419
 
430
 
define format-me
431
 
@rm -f $@
432
 
makeinfo --no-validate --plaintext --no-number-sections $< -o $@
433
 
-chmod a-w $@
434
 
endef
435
 
INSTALL: manual/install.texi manual/macros.texi; $(format-me)
436
 
manual/dir-add.texi manual/dir-add.info: FORCE
437
 
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
420
INSTALL: manual/install.texi manual/macros.texi \
 
421
         $(common-objpfx)manual/pkgvers.texi
 
422
        makeinfo --no-validate --plaintext --no-number-sections \
 
423
                 -I$(common-objpfx)manual $< -o $@
 
424
        -chmod a-w $@
 
425
$(common-objpfx)manual/%: FORCE
 
426
        $(MAKE) $(PARALLELMFLAGS) -C manual $@
438
427
FORCE:
439
428
 
440
 
iconvdata/% localedata/% po/% manual/%: FORCE
 
429
iconvdata/% localedata/% po/%: FORCE
441
430
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
442
431
 
443
432
# glibc 2.0 contains some header files which aren't used with glibc 2.1