← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/rules.mk

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/coreconf/rules.mk
273
273
$(PROGRAM): $(OBJS) $(EXTRA_LIBS)
274
274
        @$(MAKE_OBJDIR)
275
275
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
276
 
        $(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS))
 
276
        $(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)) $(EXTRA_EXE_LD_FLAGS)
277
277
ifdef MT
278
278
        if test -f $@.manifest; then \
279
279
                $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
338
338
endif   # MSVC with manifest tool
339
339
endif
340
340
else
341
 
ifeq ($(OS_TARGET),RISCOS)
342
 
        $(MKSHLIB) $@ $(OBJS) $(SUB_SHLOBJS)
343
 
else
344
341
        $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
345
 
endif
346
342
        chmod +x $@
347
343
ifeq ($(OS_TARGET),Darwin)
348
344
ifdef MAPFILE
373
369
        @$(MAKE_OBJDIR)
374
370
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
375
371
        $(MKPROG) $< -Fe$@ -link \
376
 
        $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 
372
        $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(EXTRA_EXE_LD_FLAGS)
377
373
ifdef MT
378
374
        if test -f $@.manifest; then \
379
375
                $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
414
410
endif
415
411
endif
416
412
 
417
 
core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
 
413
# The quotes allow absolute paths to contain spaces.
 
414
core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))"
418
415
 
419
416
$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
420
417
        @$(MAKE_OBJDIR)
878
875
 
879
876
-include $(DEPENDENCIES)
880
877
 
881
 
ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
 
878
ifneq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
882
879
# Can't use sed because of its 4000-char line length limit, so resort to perl
883
880
PERL_DEPENDENCIES_PROGRAM =                                                   \
884
881
            open(MD, "< $(DEPENDENCIES)");                                    \