[Libreoffice-commits] core.git: external/nss

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 25 12:27:33 UTC 2020


 external/nss/ExternalProject_nss.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d591a682e46ff352f06a61c024ef661dd17f4ea4
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Mar 25 10:04:32 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Mar 25 13:26:55 2020 +0100

    remove a dependency that doesn't make a sense
    
    Change-Id: Idc88476213a01643f5ba6b8ea9fbee78673d7769
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91032
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index a0ca7cf04528..e39f1449df64 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,nss,build))
 nss_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/python
 nss_SETUP_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/setup-python
 
-$(call gb_ExternalProject_get_state_target,nss,build): \
-    $(call gb_ExternalExecutable_get_dependencies,python) \
-    $(call gb_UnpackedTarball_get_target,gyp) | $(dir $(call gb_ExternalProject_get_target,gyp)).dir
+$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_UnpackedTarball_get_target,gyp)
 	$(call gb_Trace_StartRange,nss,EXTERNAL)
 	cp $(SRCDIR)/external/nss/python-cygwin-template $(nss_PYTHON)
 	pythondir=$$($(call gb_ExternalExecutable_get_command,python) -c 'import sys; import os; sys.stdout.write(os.path.dirname(sys.executable))') \


More information about the Libreoffice-commits mailing list