diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-01-02 18:10:13 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-07 09:22:15 +0000 |
| commit | 6eff6fae6272e8ed5d74553597bb4b73db3f2864 (patch) | |
| tree | fc6023495e56a2a512e28f421f9ba1f5d82e26fd /nss | |
| parent | 85e36d2baa54eb7b65cc680389eacb2b5884c100 (diff) | |
Get rid of nsinstall hackery
This removes the need for using NSS Build Tools on windows.
It also removes the nees to build nss for the build system while cross
compiling.
Change-Id: I13c9fdb575223f2940d3e4eda00e77ba9158f2b7
Reviewed-on: https://gerrit.libreoffice.org/1534
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 11 | ||||
| -rw-r--r-- | nss/Module_nss.mk | 2 | ||||
| -rw-r--r-- | nss/nsinstall.py | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 330a6e6c81d1..7ddbcaed4db5 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -34,15 +34,15 @@ $(call gb_ExternalProject_get_state_target,nss,configure): ifeq ($(OS),WNT) ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) cd $(EXTERNAL_WORKDIR)/mozilla/security/nss \ && $(if $(debug),,BUILD_OPT=1) \ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ - PATH="$(NSSBUILDTOOLS)/msys/bin:$(NSSBUILDTOOLS)/moztools/bin:$(PATH)" \ $(if $(filter X,$(CPU)),USE_64=1) \ LIB="$(ILIB)" \ XCFLAGS="$(SOLARINC)" \ $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ + NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py' \ && touch $@ @@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ OS_LIBS="-ladvapi32 -lws2_32 -lmwsock -lwinm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \ OS_TARGET=WINNT RC="$(WINDRES)" OS_RELEASE="5.0" \ - PATH="$(NSSBUILDTOOLS)/bin:$(PATH)" IMPORT_LIB_SUFFIX=dll.a \ + IMPORT_LIB_SUFFIX=dll.a \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \ NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py" \ $(MAKE) -j1 nss_build_all \ @@ -69,10 +69,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter YES,$(CROSS_COMPILING)),\ $(if $(filter MACOSXP,$(OS)$(CPU)),CPU_ARCH=ppc) \ - NSINSTALL="$(subst $(INPATH),$(INPATH_FOR_BUILD),\ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/security/coreconf/nsinstall/out/nsinstall)") \ + NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py") \ NSDISTMODE=copy \ - $(MAKE) -j1 $(if $(filter build,$(gb_Side)),build_coreconf,nss_build_all) \ + $(MAKE) -j1 nss_build_all \ && touch $@ endif diff --git a/nss/Module_nss.mk b/nss/Module_nss.mk index 5455fc0670a3..c1619ffb14d3 100644 --- a/nss/Module_nss.mk +++ b/nss/Module_nss.mk @@ -13,7 +13,7 @@ ifeq ($(SYSTEM_NSS),NO) ifeq ($(filter ANDROID IOS,$(OS)),) $(eval $(call gb_Module_add_targets,nss,\ UnpackedTarball_nss \ - $(if $(filter build,$(gb_Side)),,ExternalPackage_nss) \ + ExternalPackage_nss \ ExternalProject_nss \ )) endif diff --git a/nss/nsinstall.py b/nss/nsinstall.py index 39d26fea523f..e1728a932449 100644 --- a/nss/nsinstall.py +++ b/nss/nsinstall.py @@ -86,11 +86,11 @@ def nsinstall(argv): if options.m: # mode is specified try: - options.m = int(options.m, 8) # I have no idea why nss insists on using this mode for installed headers. # It causes problems with updating the files during a rebuild. - if options.m == 0444: - options.m = 0644 + if options.m == 444: + options.m = 644 + options.m = int(options.m) except: sys.stderr.write('nsinstall: ' + options.m + ' is not a valid mode\n') return 1 |