diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2015-06-06 08:39:12 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-06-08 13:44:00 +0000 |
| commit | ca96e9a8c20b9fc60bf82e6f510e5469de01103a (patch) | |
| tree | 261e140909a8ff324d98fe8c0ed63a3022297838 /external/python3 | |
| parent | d32a663dde1f86b3949a83ea7b5907f566d282f0 (diff) | |
Allow building Python on Mac with GNU xargs
GNU xargs executes the command at least once even if the standard input
is empty, unlike BSD xargs, which causes rm -r to be called with no
arguments ween the find command finds nothing leading to an error.
Adding -f to rm allows buikding with either implementation.
Change-Id: I0df5fcb379d2a5a8b1121594ec1a82d917d80dfc
Reviewed-on: https://gerrit.libreoffice.org/16116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 8c5b1b71c808..b091bfcb4738 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/python-3.3.3-msvc2012-winxp.patch.1 \ external/python3/python-3.3.5-pyexpat-symbols.patch.1 \ external/python3/python-3.3.5-vs2013.patch.1 \ + external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 \ external/python3/python-msvc-disable-sse2.patch.1 \ external/python3/python-lsan.patch.0 \ external/python3/ubsan.patch.0 \ diff --git a/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 b/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 new file mode 100644 index 000000000000..d955618674e5 --- /dev/null +++ b/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 @@ -0,0 +1,12 @@ +diff -ur python3.org/Mac/PythonLauncher/Makefile.in python3/Mac/PythonLauncher/Makefile.in +--- python3.org/Mac/PythonLauncher/Makefile.in 2015-06-06 08:47:38.000000000 +0300 ++++ python3/Mac/PythonLauncher/Makefile.in 2015-06-06 08:48:18.000000000 +0300 +@@ -53,7 +53,7 @@ + --resource=$(srcdir)/factorySettings.plist \ + --plist Info.plist \ + build +- find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r ++ find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -rf + + + FileSettings.o: $(srcdir)/FileSettings.m |