diff options
Diffstat (limited to 'nss')
-rw-r--r-- | nss/ExternalProject_nss.mk | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 7ddbcaed4db5..aa84385ca16d 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -17,62 +17,62 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ )) $(call gb_ExternalProject_get_state_target,nss,configure): - cd $(EXTERNAL_WORKDIR) \ - && $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ + $(call gb_ExternalProject_run,configure,\ + $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && sed -e 's%@prefix@%$(OUTDIR)%' \ - -e 's%@includedir@%$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \ - -e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \ - -e 's%@MOD_MINOR_VERSION@%$(NSS_MINOR)%' \ - -e 's%@MOD_PATCH_VERSION@%$(NSS_PATCH)%' \ - $(SRCDIR)/nss/nss-config.in > $(EXTERNAL_WORKDIR)/config/nss-config \ + -e 's%@includedir@%$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \ + -e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \ + -e 's%@MOD_MINOR_VERSION@%$(NSS_MINOR)%' \ + -e 's%@MOD_PATCH_VERSION@%$(NSS_PATCH)%' \ + $(SRCDIR)/nss/nss-config.in > $(EXTERNAL_WORKDIR)/config/nss-config \ && chmod a+x $(EXTERNAL_WORKDIR)/config/nss-config \ - && touch $@ + ,,nss_configure.log) ifeq ($(OS),WNT) ifeq ($(COM),MSC) $(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 \ - $(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 $@ + $(call gb_ExternalProject_run,build,\ + $(if $(debug),,BUILD_OPT=1) \ + MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ + $(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' \ + ,mozilla/security/nss) else $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) - cd $(EXTERNAL_WORKDIR)/mozilla/security/nss \ - CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - 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" \ - 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 \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + 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" \ + 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 \ + ,mozilla/security/nss) endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) - cd $(EXTERNAL_WORKDIR)/mozilla/security/nss \ - && $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ - $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ - $(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ - $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ - $(if $(filter YES,$(CROSS_COMPILING)),\ - $(if $(filter MACOSXP,$(OS)$(CPU)),CPU_ARCH=ppc) \ - NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py") \ - NSDISTMODE=copy \ - $(MAKE) -j1 nss_build_all \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ + $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ + $(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ + $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ + $(if $(filter YES,$(CROSS_COMPILING)),\ + $(if $(filter MACOSXP,$(OS)$(CPU)),CPU_ARCH=ppc) \ + NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py") \ + NSDISTMODE=copy \ + $(MAKE) -j1 nss_build_all \ + ,mozilla/security/nss) endif |