diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-08-30 15:37:03 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-30 16:10:16 +0200 |
| commit | 291b85778669b4e4e276faab22add9d0e80046df (patch) | |
| tree | 05b81f198bd66bc63c6d9d44cd8389730ae0185e /nss/makefile.mk | |
| parent | a44712b810eba7ba3032c9eb15441997b064d846 (diff) | |
Build our mozilla (module moz) against the nss we have built anyway.
Reduces the build time of the 'moz' module by 30% or so.
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 45f1feb22680..aa242bdbd11b 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -41,10 +41,14 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss-3.12.8-with-nspr-4.8.6 +VER_MAJOR=3 +VER_MINOR=12 +VER_PATCH=8 + +TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6 TARFILE_MD5=71474203939fafbe271e1263e61d083e -TARFILE_ROOTDIR=nss-3.12.8 -PATCH_FILES=nss.patch nss.aix.patch +TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) +PATCH_FILES=nss.patch nss.aix.patch nss-config.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=nss_macosx.patch @@ -56,6 +60,10 @@ BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF +CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(OUTDIR) --includedir=$(OUTDIR)/inc/mozilla/nspr ; \ + sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \ + chmod a+x mozilla/security/nss/nss-config + .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" .IF "$(BUILD64)"=="1" @@ -85,6 +93,8 @@ MACOS_SDK_DIR*=$(MACDEVSDK) OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=config$/nspr-config mozilla$/security$/nss$/nss-config + BUILD_DIR=mozilla$/security$/nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# @@ -116,7 +126,6 @@ nss_LIBS= nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF - BUILD_DIR=mozilla$/security$/nss BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all @@ -164,7 +173,10 @@ OUT2LIB= \ .ENDIF # "$(COM)"=="GCC" -OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) \ + config$/nspr-config \ + mozilla$/security$/nss$/nss-config + .ENDIF # "$(GUI)"=="WNT" |