diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-06 21:28:17 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-07 08:44:28 +0000 |
| commit | e9cd5087366f930efd89a95c0a5610fe8f375581 (patch) | |
| tree | 77e83e7d88a8f6cf4a485b5f70686588661bc7a8 /external | |
| parent | 2e11a3e03ed37eb86cd87f68191c48d2a6e442cb (diff) | |
configure: hard-code /usr/bin/{sort,find} for Cygwin
... to avoid calling C:/Windows/system32/{sort,find}.exe, if those
happen to be first in PATH.
On a Windows 7 system, the other conflicts appear to be harmless,
we don't use "more", "expand", "timeout", "whoami".
Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57
Reviewed-on: https://gerrit.libreoffice.org/21175
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 2 | ||||
| -rwxr-xr-x | external/python3/ExternalProject_python3.mk | 2 | ||||
| -rw-r--r-- | external/python33/ExternalProject_python3.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index b44f576e7715..6cc498781b31 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl ifeq ($(OS_FOR_BUILD),WNT) $(eval $(call gb_UnpackedTarball_set_pre_action,openssl,\ cd include/openssl && \ - for header in `find . -type l` \; do \ + for header in `$(FIND) . -type l` \; do \ cp --remove-destination `readlink $$$$header` $$$$header \; \ done && cd -)) endif diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 200588fab072..76f8d886b314 100755 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -128,7 +128,7 @@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../../../../LibreOfficePython \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython - for file in $(shell find $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ + for file in $(shell $(FIND) $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @loader_path/../../../LibreOfficePython $$file ; done diff --git a/external/python33/ExternalProject_python3.mk b/external/python33/ExternalProject_python3.mk index 098b1ea6957e..a3c4586a49a8 100644 --- a/external/python33/ExternalProject_python3.mk +++ b/external/python33/ExternalProject_python3.mk @@ -126,7 +126,7 @@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../../../../LibreOfficePython \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython - for file in $(shell find $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ + for file in $(shell $(FIND) $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @loader_path/../../../LibreOfficePython $$file ; done |