external/glm/UnpackedTarball_glm.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 05925ef8a49f3ba302140bd37ba9c4848598638d
Author: Thomas Klausner <w...@netbsd.org>
Date: Sat Aug 8 17:59:09 2015 +0200
Do not add --binary to patch flags unconditionally.
It is only needed for Cygwin, and some patch(1) don't support it,
like NetBSD's.
Solution suggested by vmiklos on irc.
Change-Id: I65a3a82e755167828658218c7d73c4f2294e587f
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index 82f4a2c..f593254 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,glm))
$(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchflags,glm,--binary))
+$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter
MSC,$(COM)),--binary)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
