← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Makerules

  • 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:
Makerules
929
929
#       $(inst_libdir)/libfoo.so        -- for linking, symlink or ld script
930
930
#       $(inst_slibdir)/libfoo.so.NN    -- for loading by SONAME, symlink
931
931
#       $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file
932
 
V := $(firstword $($(subdir)-version) $(version))
 
932
lib-version := $(firstword $($(subdir)-version) $(version))
933
933
install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \
934
934
                      $(foreach L,$(install-lib.so-versioned),\
935
935
                                $(inst_libdir)/$L \
936
 
                                $(inst_slibdir)/$(L:.so=)-$V.so \
 
936
                                $(inst_slibdir)/$(L:.so=)-$(lib-version).so \
937
937
                                $(inst_slibdir)/$L$($L-version))
938
938
 
939
939
# Install all the unversioned shared libraries.
1258
1258
        mv -f $@T $@
1259
1259
 
1260
1260
%.dynsym: %.so
1261
 
        $(OBJDUMP) --dynamic-syms $< > $@T
 
1261
        LC_ALL=C $(OBJDUMP) --dynamic-syms $< > $@T
1262
1262
        mv -f $@T $@
1263
1263
 
1264
1264
vpath %.abilist $(+sysdep_dirs)
1419
1419
        -rm -f $(gen-as-const-headers:%.sym=$(common-objpfx)%.h)
1420
1420
 
1421
1421
# Produce a file `stubs' which contains `#define __stub_FUNCTION'
1422
 
# for each function which is a stub.  We grovel over all the .d files
1423
 
# looking for references to <stub-tag.h>.  Then we grovel over each
1424
 
# referenced source file to see what stub function it defines.
 
1422
# for each function which is a stub.
1425
1423
 
1426
1424
ifdef objpfx
1427
1425
.PHONY: stubs # The parent Makefile calls this target.