summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-11-03 20:15:13 +0200
committerDavid Tardon <dtardon@redhat.com>2013-11-04 02:26:20 -0600
commit55df380f008851af859970bfb88942b8872f9cda (patch)
tree7896b02e186deac342c09aaa12f201de9a2a5526
parent11d41e980a5e2d5a4f75183af422a99a79692fc4 (diff)
fdo#70393: move nss to a subdir of external
Change-Id: Ibbeb6b284c6c5fb9bba4ad52abed69321bba90d8 Reviewed-on: https://gerrit.libreoffice.org/6545 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat
-rw-r--r--RepositoryModule_build.mk1
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk2
-rw-r--r--external/nss/ExternalPackage_nss.mk (renamed from nss/ExternalPackage_nss.mk)0
-rw-r--r--external/nss/ExternalProject_nss.mk (renamed from nss/ExternalProject_nss.mk)6
-rw-r--r--external/nss/Makefile (renamed from nss/Makefile)2
-rw-r--r--external/nss/Module_nss.mk (renamed from nss/Module_nss.mk)0
-rw-r--r--external/nss/README (renamed from nss/README)0
-rw-r--r--external/nss/UnpackedTarball_nss.mk (renamed from nss/UnpackedTarball_nss.mk)18
-rw-r--r--external/nss/nsinstall.py (renamed from nss/nsinstall.py)0
-rw-r--r--external/nss/nspr-4.9-build.patch.3 (renamed from nss/nspr-4.9-build.patch.3)0
-rw-r--r--external/nss/nss-3.13.3-build.patch.3 (renamed from nss/nss-3.13.3-build.patch.3)0
-rw-r--r--external/nss/nss-3.13.5-zlib-werror.patch (renamed from nss/nss-3.13.5-zlib-werror.patch)0
-rw-r--r--external/nss/nss.aix.patch (renamed from nss/nss.aix.patch)0
-rw-r--r--external/nss/nss.mingw.patch.3 (renamed from nss/nss.mingw.patch.3)0
-rw-r--r--external/nss/nss.patch (renamed from nss/nss.patch)0
-rw-r--r--external/nss/nss.wheader-guard.patch.0 (renamed from nss/nss.wheader-guard.patch.0)0
-rw-r--r--external/nss/nss.windows.patch (renamed from nss/nss.windows.patch)0
-rw-r--r--external/nss/nss_macosx.patch (renamed from nss/nss_macosx.patch)0
19 files changed, 15 insertions, 15 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 18ea8bc6446b..acd899b58f9e 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 7655e0fd65ce..1b9b9d350415 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 2547160110b9..8321a2e9023e 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
index 054c7977984f..054c7977984f 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
diff --git a/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 475a7d8368b8..af354e517763 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
index ccb1c85a04da..e4968cf85fb6 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
index c1619ffb14d3..c1619ffb14d3 100644
--- a/nss/Module_nss.mk
+++ b/external/nss/Module_nss.mk
diff --git a/nss/README b/external/nss/README
index 77bc8172c976..77bc8172c976 100644
--- a/nss/README
+++ b/external/nss/README
diff --git a/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index ea7ca1c17cd7..529f2fd61e08 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
index 31b3de3450c5..31b3de3450c5 100644
--- a/nss/nsinstall.py
+++ b/external/nss/nsinstall.py
diff --git a/nss/nspr-4.9-build.patch.3 b/external/nss/nspr-4.9-build.patch.3
index 1ed211a803a6..1ed211a803a6 100644
--- a/nss/nspr-4.9-build.patch.3
+++ b/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
index ee4ff042cf29..ee4ff042cf29 100644
--- a/nss/nss-3.13.3-build.patch.3
+++ b/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
index c3440c8ed99f..c3440c8ed99f 100644
--- a/nss/nss-3.13.5-zlib-werror.patch
+++ b/external/nss/nss-3.13.5-zlib-werror.patch
diff --git a/nss/nss.aix.patch b/external/nss/nss.aix.patch
index a8a6a8eaf1ee..a8a6a8eaf1ee 100644
--- a/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
diff --git a/nss/nss.mingw.patch.3 b/external/nss/nss.mingw.patch.3
index db073e94919a..db073e94919a 100644
--- a/nss/nss.mingw.patch.3
+++ b/external/nss/nss.mingw.patch.3
diff --git a/nss/nss.patch b/external/nss/nss.patch
index e2d7d7653308..e2d7d7653308 100644
--- a/nss/nss.patch
+++ b/external/nss/nss.patch
diff --git a/nss/nss.wheader-guard.patch.0 b/external/nss/nss.wheader-guard.patch.0
index a5d4060392ce..a5d4060392ce 100644
--- a/nss/nss.wheader-guard.patch.0
+++ b/external/nss/nss.wheader-guard.patch.0
diff --git a/nss/nss.windows.patch b/external/nss/nss.windows.patch
index 0d4ce1b5baea..0d4ce1b5baea 100644
--- a/nss/nss.windows.patch
+++ b/external/nss/nss.windows.patch
diff --git a/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 102e9a322fdc..102e9a322fdc 100644
--- a/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 05:26:08 +0000