Kaydet (Commit) 55df380f authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) David Tardon

fdo#70393: move nss to a subdir of external

Change-Id: Ibbeb6b284c6c5fb9bba4ad52abed69321bba90d8
Reviewed-on: https://gerrit.libreoffice.org/6545Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 11d41e98
......@@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
editeng \
framework \
linguistic \
nss \
package \
sfx2 \
sot \
......
......@@ -77,7 +77,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
$(call gb_Helper_optional,NSS,nss) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
offapi \
......
......@@ -63,6 +63,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
......@@ -73,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,NSS,nss) \
) \
) \
))
......
......@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
LIB="$(ILIB)" \
XCFLAGS="$(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py' \
NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,mozilla/security/nss)
......@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
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="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py" \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
,mozilla/security/nss)
......@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter YES,$(CROSS_COMPILING)),\
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
NSDISTMODE=copy \
$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
......
......@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
......@@ -12,15 +12,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,nss))
$(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
nss/nss.patch \
nss/nss.aix.patch \
nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter MACOSX,$(OS)),nss/nss_macosx.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)),nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),nss/nspr-4.9-build.patch.3 \
nss/nss-3.13.3-build.patch.3 \
nss/nss.mingw.patch.3) \
nss/nss.wheader-guard.patch.0 \
external/nss/nss.patch \
external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter MACOSX,$(OS)),external/nss/nss_macosx.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
external/nss/nss.wheader-guard.patch.0 \
))
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment