← Back to branch summary

~ubuntu-branches/ubuntu/hardy/nss/hardy-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/freebl/config.mk

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-01 16:57:40 UTC
  • mfrom: (1.1.8 upstream) (7.1.1 hardy-security)
  • Revision ID: james.westby@ubuntu.com-20090801165740-4edm78cga2bcxxub
Tags: 3.12.3.1-0ubuntu0.8.04.1
https://launchpad.net/bugs/407549
https://launchpad.net/bugs/388350
* new upstream release 3.12.3.1 RTM (NSS_3_12_3_1_RTM) (LP: #407549)
  - see USN-810-1
* requires nspr >= 4.7.4
  - update debian/control
* drop (ubuntu-)useless kbsd patch
  - delete debian/patches/38_kbsd.patch
* drop obsolete patches fixed upstream
  - delete debian/patches/80_security_tools.patch
  - delete debian/patches/bz471715_attachment_357235-backport.patch
* adjust patches to new upstream codebase
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/81_sonames.patch
* LP: #388350 - nss 3.12.3-0ubuntu2 ftbfs in karmic - shlibsign crashes; we add
  debian/libnss3-1d/usr/lib/nss to LD_LIBRARY_PATH for the shlibsign invocation
  used to sign libs in debian/rules
  - update debian/rules
* update .symbols files for new upstream api
  - update debian/libnss3-1d.symbols
* bump shlibs version to >= 3.12.3
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/freebl/config.mk
1
 
#
2
1
# ***** BEGIN LICENSE BLOCK *****
3
2
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
4
3
#
85
84
RES     = $(OBJDIR)/$(LIBRARY_NAME).res
86
85
RESNAME = freebl.rc
87
86
 
 
87
ifndef WINCE
 
88
OS_LIBS += shell32.lib
 
89
endif
 
90
 
88
91
ifdef NS_USE_GCC
89
92
EXTRA_SHARED_LIBS += \
90
93
        -L$(DIST)/lib \
91
94
        -lnssutil3 \
92
95
        -L$(NSPR_LIB_DIR) \
93
 
        -lplc4 \
94
 
        -lplds4 \
95
96
        -lnspr4 \
96
97
        $(NULL)
97
98
else # ! NS_USE_GCC
98
99
EXTRA_SHARED_LIBS += \
99
100
        $(DIST)/lib/nssutil3.lib \
100
 
        $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
101
 
        $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
102
101
        $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
103
102
        $(NULL)
104
103
endif # NS_USE_GCC
105
104
 
106
105
else
107
106
 
 
107
ifndef FREEBL_NO_DEPEND
108
108
EXTRA_SHARED_LIBS += \
109
109
        -L$(DIST)/lib \
110
110
        -lnssutil3 \
111
111
        -L$(NSPR_LIB_DIR) \
112
 
        -lplc4 \
113
 
        -lplds4 \
114
112
        -lnspr4 \
115
113
        $(NULL)
 
114
else
 
115
#drop pthreads as well
 
116
OS_PTHREAD=
 
117
endif
 
118
endif
116
119
 
 
120
ifeq ($(OS_ARCH), Darwin)
 
121
EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib
117
122
endif
118
123
 
119
124
endif