RepositoryModule_build.mk | 1 RepositoryModule_host.mk | 1 external/Module_external.mk | 2 external/nss/ExternalPackage_nss.mk | 60 ++++++ external/nss/ExternalProject_nss.mk | 87 +++++++++ external/nss/Makefile | 7 external/nss/Module_nss.mk | 22 ++ external/nss/README | 77 ++++++++ external/nss/UnpackedTarball_nss.mk | 26 ++ external/nss/nsinstall.py | 164 +++++++++++++++++ external/nss/nspr-4.9-build.patch.3 | 285 ++++++++++++++++++++++++++++++ external/nss/nss-3.13.3-build.patch.3 | 259 +++++++++++++++++++++++++++ external/nss/nss-3.13.5-zlib-werror.patch | 12 + external/nss/nss.aix.patch | 143 +++++++++++++++ external/nss/nss.mingw.patch.3 | 128 +++++++++++++ external/nss/nss.patch | 242 +++++++++++++++++++++++++ external/nss/nss.wheader-guard.patch.0 | 11 + external/nss/nss.windows.patch | 22 ++ external/nss/nss_macosx.patch | 78 ++++++++ nss/ExternalPackage_nss.mk | 60 ------ nss/ExternalProject_nss.mk | 87 --------- nss/Makefile | 7 nss/Module_nss.mk | 22 -- nss/README | 77 -------- nss/UnpackedTarball_nss.mk | 26 -- nss/nsinstall.py | 164 ----------------- nss/nspr-4.9-build.patch.3 | 285 ------------------------------ nss/nss-3.13.3-build.patch.3 | 259 --------------------------- nss/nss-3.13.5-zlib-werror.patch | 12 - nss/nss.aix.patch | 143 --------------- nss/nss.mingw.patch.3 | 128 ------------- nss/nss.patch | 242 ------------------------- nss/nss.wheader-guard.patch.0 | 11 - nss/nss.windows.patch | 22 -- nss/nss_macosx.patch | 78 -------- 35 files changed, 1625 insertions(+), 1625 deletions(-)
New commits: commit 55df380f008851af859970bfb88942b8872f9cda Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:15:13 2013 +0200 fdo#70393: move nss to a subdir of external Change-Id: Ibbeb6b284c6c5fb9bba4ad52abed69321bba90d8 Reviewed-on: https://gerrit.libreoffice.org/6545 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 18ea8bc..acd899b 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ editeng \ framework \ linguistic \ - nss \ package \ sfx2 \ sot \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 7655e0f..1b9b9d3 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -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 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2547160..8321a2e 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -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) \ ) \ ) \ )) diff --git a/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk similarity index 100% rename from nss/ExternalPackage_nss.mk rename to external/nss/ExternalPackage_nss.mk diff --git a/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk similarity index 97% rename from nss/ExternalProject_nss.mk rename to external/nss/ExternalProject_nss.mk index 475a7d8..af354e5 100644 --- a/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -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 \ diff --git a/nss/Makefile b/external/nss/Makefile similarity index 71% rename from nss/Makefile rename to external/nss/Makefile index ccb1c85..e4968cf 100644 --- a/nss/Makefile +++ b/external/nss/Makefile @@ -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: diff --git a/nss/Module_nss.mk b/external/nss/Module_nss.mk similarity index 100% rename from nss/Module_nss.mk rename to external/nss/Module_nss.mk diff --git a/nss/README b/external/nss/README similarity index 100% rename from nss/README rename to external/nss/README diff --git a/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk similarity index 55% rename from nss/UnpackedTarball_nss.mk rename to external/nss/UnpackedTarball_nss.mk index ea7ca1c..529f2fd 100644 --- a/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -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: diff --git a/nss/nsinstall.py b/external/nss/nsinstall.py similarity index 100% rename from nss/nsinstall.py rename to external/nss/nsinstall.py diff --git a/nss/nspr-4.9-build.patch.3 b/external/nss/nspr-4.9-build.patch.3 similarity index 100% rename from nss/nspr-4.9-build.patch.3 rename to external/nss/nspr-4.9-build.patch.3 diff --git a/nss/nss-3.13.3-build.patch.3 b/external/nss/nss-3.13.3-build.patch.3 similarity index 100% rename from nss/nss-3.13.3-build.patch.3 rename to external/nss/nss-3.13.3-build.patch.3 diff --git a/nss/nss-3.13.5-zlib-werror.patch b/external/nss/nss-3.13.5-zlib-werror.patch similarity index 100% rename from nss/nss-3.13.5-zlib-werror.patch rename to external/nss/nss-3.13.5-zlib-werror.patch diff --git a/nss/nss.aix.patch b/external/nss/nss.aix.patch similarity index 100% rename from nss/nss.aix.patch rename to external/nss/nss.aix.patch diff --git a/nss/nss.mingw.patch.3 b/external/nss/nss.mingw.patch.3 similarity index 100% rename from nss/nss.mingw.patch.3 rename to external/nss/nss.mingw.patch.3 diff --git a/nss/nss.patch b/external/nss/nss.patch similarity index 100% rename from nss/nss.patch rename to external/nss/nss.patch diff --git a/nss/nss.wheader-guard.patch.0 b/external/nss/nss.wheader-guard.patch.0 similarity index 100% rename from nss/nss.wheader-guard.patch.0 rename to external/nss/nss.wheader-guard.patch.0 diff --git a/nss/nss.windows.patch b/external/nss/nss.windows.patch similarity index 100% rename from nss/nss.windows.patch rename to external/nss/nss.windows.patch diff --git a/nss/nss_macosx.patch b/external/nss/nss_macosx.patch similarity index 100% rename from nss/nss_macosx.patch rename to external/nss/nss_macosx.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
