Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 197890: Eliminated the artificial dependency of all NSS cmd tools on

Browse Source 
zlib.  Only some of them (modutil and signtool) need zlib and we now define
that dependency explicitly.  In shlibsign/sign.sh, escape the drive letter
if the pathname contains it and we are using Cygwin so that the pathname
does not contain any colon, which is the PATH separator in Cygwin. r=relyea
Modified Files: platlibs.mk modutil/manifest.mn shlibsign/sign.sh
	signtool/manifest.mn
This commit is contained in:
wtc%netscape.com 2003-03-17 21:48:18 +00:00
parent df7b588e25
commit d26ae8d600
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/nss/cmd/modutil/manifest.mn
View File

@ -59,4 +59,4 @@ DEFINES = -DNSPR20
# USE_STATIC_LIBS = 1
EXTRA_LIBS += $(JAR_LIBS)
EXTRA_LIBS = $(JAR_LIBS)

17
security/nss/cmd/platlibs.mk
View File

@ -34,7 +34,6 @@
ifdef USE_STATIC_LIBS
JAR_LIBS=
# can't do this in manifest.mn because OS_ARCH isn't defined there.
ifeq ($(OS_ARCH), WINNT)
@ -52,8 +51,6 @@ endif
EXTRA_LIBS += \
$(DIST)/lib/smime.lib \
$(DIST)/lib/ssl.lib \
$(DIST)/lib/jar.lib \
$(DIST)/lib/zlib.lib \
$(DIST)/lib/nss.lib \
$(DIST)/lib/ssl.lib \
$(DIST)/lib/sectool.lib \
@ -81,6 +78,10 @@ EXTRA_LIBS += \
wsock32.lib \
winmm.lib \
$(NULL)
JAR_LIBS = $(DIST)/lib/jar.lib \
$(DIST)/lib/zlib.lib \
$(NULL)
else
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
@ -95,8 +96,6 @@ endif
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
@ -141,7 +140,11 @@ EXTRA_SHARED_LIBS += \
endif
endif
else
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
$(NULL)
else # USE_STATIC_LIBS
# can't do this in manifest.mn because OS_ARCH isn't defined there.
ifeq ($(OS_ARCH), WINNT)
@ -211,4 +214,4 @@ JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(NULL)
endif
endif
endif # USE_STATIC_LIBS

12
security/nss/cmd/shlibsign/sign.sh
View File

@ -3,7 +3,13 @@ if [ ${3} = "YES" ]; then
if echo "${PATH}" | grep -c \; >/dev/null; then
PATH=${PATH}\;${1}/bin\;${1}/lib
else
PATH=${PATH}:${1}/bin:${1}/lib
# ARG1 is ${1} with the drive letter escaped.
if echo "${1}" | grep -c : >/dev/null; then
ARG1=`(cd ${1}; pwd)`
else
ARG1=${1}
fi
PATH=${PATH}:${ARG1}/bin:${ARG1}/lib
fi
export PATH
else
@ -16,5 +22,5 @@ else
DYLD_LIBRARY_PATH=${1}/lib
export DYLD_LIBRARY_PATH
fi
echo ./${2}/shlibsign -v -i ${4}
./${2}/shlibsign -v -i ${4}
echo ${2}/shlibsign -v -i ${4}
${2}/shlibsign -v -i ${4}

2
security/nss/cmd/signtool/manifest.mn
View File

@ -53,3 +53,5 @@ REQUIRES = dbm seccmd
DEFINES += -DNSPR20
USE_STATIC_LIBS = 1
EXTRA_LIBS = $(JAR_LIBS)