ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Make some externals' libtool copies cope with -mllvm

Browse Source 
...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
This commit is contained in:
Stephan Bergmann
2017-05-02 22:51:33 +02:00
parent 9999d9ee61
commit 69578399e2
8 changed files with 247 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/coinmp/UnpackedTarball_coinmp.mk
Vendored
+1
View File
@@ -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:
external/coinmp/libtool.patch
Vendored
+162
View File
@@ -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
external/redland/UnpackedTarball_raptor.mk
Vendored
+1
View File
@@ -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:
external/redland/UnpackedTarball_rasqal.mk
Vendored
+1
View File
@@ -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:
external/redland/UnpackedTarball_redland.mk
Vendored
+1
View File
@@ -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:
external/redland/raptor/libtool.patch
Vendored
+27
View File
@@ -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
external/redland/rasqal/libtool.patch
Vendored
+27
View File
@@ -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
external/redland/redland/libtool.patch
Vendored
+27
View File
@@ -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