diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-07 20:19:58 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-07 22:42:24 +0100 |
| commit | 2baa4b333fe3046f106e114a01dfe0411a6cc6f0 (patch) | |
| tree | bdee8c1f08f6d215a4625b0075b1aebb0602ee7e | |
| parent | RepositoryModule_ooo.mk: add android (diff) | |
| download | core-2baa4b333fe3046f106e114a01dfe0411a6cc6f0.tar.gz core-2baa4b333fe3046f106e114a01dfe0411a6cc6f0.zip | |
nss: depend on python3
nss is not in tail_build because of moz, so expat, external, openssl and
python3 must go also out.
Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57
| -rw-r--r-- | Module_tail_build.mk | 4 | ||||
| -rw-r--r-- | nss/prj/build.lst | 2 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 0407aae22c6e..dfac982f0b55 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -70,9 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ embedserv \ $(call gb_Helper_optional,EPM,epm) \ eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ extensions \ - external \ extras \ fileaccess \ filter \ @@ -134,13 +132,11 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ oovbaapi \ oox \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ package \ padmin \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ psprint_config \ $(call gb_Helper_optional,PYUNO,pyuno) \ - $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ $(call gb_Helper_optional,REDLAND,redland) \ diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 9c4caa13b545..b5f776f612ba 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,2 +1,2 @@ -ns nss : solenv soltools NULL +ns nss : solenv soltools PYTHON:python3 NULL ns nss\prj nmake - all ns_nss NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 0b03bb2d7cba..5d1340647af7 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss XPDF:xpdf solenv soltools NULL +tb tail_build : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL |