Make some externals' libtool copies cope with -mllvm

...as needed e.g. for <https://bugs.llvm.org/show_bug.cgi?id=32349> "r294897 +
NewGVN cause build failure with LibreOffice", by applying
<http://git.savannah.gnu.org/cgit/libtool.git/commit/
?id=d9a35fe9d3508b5c0d56e7f2ec80fc05e8415fa3> "libtool: Discard '-mllvm $arg'
options when linking."

Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0

8 files changed, 247 insertions, 0 deletions

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 0bf3f8cfb60b..b643b8e5d7d4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/werror-format-pedantic.patch.0 \
 	external/coinmp/ubsan.patch.0 \
 	external/coinmp/rpath.patch \
+	external/coinmp/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/libtool.patch b/external/coinmp/libtool.patch
new file mode 100644
index 000000000000..ca1716f5fdb2
--- /dev/null
+++ b/external/coinmp/libtool.patch
@@ -0,0 +1,162 @@
+--- Cbc/ltmain.sh
++++ Cbc/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+--- Cgl/ltmain.sh
++++ Cgl/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+--- Clp/ltmain.sh
++++ Clp/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+--- CoinMP/ltmain.sh
++++ CoinMP/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+--- CoinUtils/ltmain.sh
++++ CoinUtils/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+--- Osi/ltmain.sh
++++ Osi/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index d37dccda6cd6..6c4a0bc41780 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	$(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \
 	external/redland/raptor/xml2-config.patch \
 	external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \
+	external/redland/raptor/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
index ed479a942d10..7ec66128733f 100644
--- a/external/redland/UnpackedTarball_rasqal.mk
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
 	$(if $(CROSS_COMPILING),external/redland/rasqal/rasqal-xcompile.patch.1) \
 	external/redland/rasqal/rpath.patch \
 	external/redland/rasqal/clang-cl.patch \
+	external/redland/rasqal/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
index 92c54aea147a..657bf484153d 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
 	external/redland/redland/redland-format.patch.0 \
 	external/redland/redland/rpath.patch \
 	external/redland/redland/clang-cl.patch \
+	external/redland/redland/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/libtool.patch b/external/redland/raptor/libtool.patch
new file mode 100644
index 000000000000..b0baae661bab
--- /dev/null
+++ b/external/redland/raptor/libtool.patch
@@ -0,0 +1,27 @@
+--- build/ltmain.sh
++++ build/ltmain.sh
+@@ -5301,6 +5301,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -5639,6 +5645,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
diff --git a/external/redland/rasqal/libtool.patch b/external/redland/rasqal/libtool.patch
new file mode 100644
index 000000000000..b0baae661bab
--- /dev/null
+++ b/external/redland/rasqal/libtool.patch
@@ -0,0 +1,27 @@
+--- build/ltmain.sh
++++ build/ltmain.sh
+@@ -5301,6 +5301,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -5639,6 +5645,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
diff --git a/external/redland/redland/libtool.patch b/external/redland/redland/libtool.patch
new file mode 100644
index 000000000000..b0baae661bab
--- /dev/null
+++ b/external/redland/redland/libtool.patch
@@ -0,0 +1,27 @@
+--- build/ltmain.sh
++++ build/ltmain.sh
+@@ -5301,6 +5301,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -5639,6 +5645,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue