diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-10-14 16:21:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-10-14 16:21:13 +0000 |
| commit | 437dec1c7fd281cdf8a8ba8fb973022a9096525c (patch) | |
| tree | 0ce4d72ad4dd3623965e5998f11b772a6e14c49f /nss/makefile.mk | |
| parent | ceec08b2ae3fdde312ea141eb2a7e3c53757e57a (diff) | |
CWS-TOOLING: integrate CWS jl135_nss
2009-10-01 15:20:03 +0200 jl r276605 : #1004856# moved to xmlsec1-mingw32.patch
2009-10-01 10:51:24 +0200 jl r276580 : #1004856# build keymgr with mingw
2009-10-01 10:50:52 +0200 jl r276579 : #1004856# build keymgr with mingw
2009-10-01 10:37:28 +0200 jl r276578 : #1004856# do not build xmlsec1 app
2009-09-29 16:01:31 +0200 jl r276532 : #1004856# Using libxml2 from solver if available
2009-09-26 16:31:32 +0200 jl r276477 : #i104856# xmlsec1-mscrypto-1 is now xmlsec1-mscrypto
2009-09-25 17:05:26 +0200 jl r276470 : CWS-TOOLING: rebase CWS jl135_nss to trunk@276429 (milestone: DEV300:m60)
2009-09-24 12:57:10 +0200 jl r276419 : #i104856# libxmlsec update
2009-09-24 12:46:58 +0200 jl r276418 : #i104856# fixing mac configure problem in configure.in and regenerating configure
2009-09-23 16:49:54 +0200 jl r276405 : i#104856# configure failed on mac
2009-09-23 10:21:35 +0200 jl r276369 : #i104856# adapting patches to apply cleanly and readme change
2009-09-21 13:45:47 +0200 jl r276326 : #i104856 updating to 1.2.12, using changes patches from cmc made on xmlsec1_2_12
2009-09-21 11:27:46 +0200 jl r276319 : #i105183# forget to uncomment PATCH_FILES
2009-09-18 17:41:20 +0200 jl r276296 : #i105183# update of nss libs
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 2d2d44336c71..4ddd2b39015f 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -45,9 +45,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_3 +TARFILE_NAME=nss_3_12_4 TARFILE_ROOTDIR=mozilla -PATCH_FILES=nss_3_12_3.patch +PATCH_FILES=nss.patch .IF "$(debug)" != "" .ELSE @@ -58,9 +58,6 @@ BUILD_OPT=1 .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -#LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -.EXPORT: LDFLAGS - .IF "$(CPU)"=="X" # force 64-bit buildmode USE_64:=1 @@ -90,7 +87,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all .IF "$(COM)"=="GCC" -PATCH_FILES+=nss_3_12_3.patch.mingw +PATCH_FILES+=nss.patch.mingw moz_build:=$(shell cygpath -p $(MOZILLABUILD)) PATH!:=$(moz_build)/bin:$(PATH) |