You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2024/01/17 06:09:06 UTC
(openoffice) 03/04: Remove "-pedantic-errors" compilation flag from CoinMP
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO41Xjammy
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6c75fe0bb198a07c725a54123d879f0b96e6f44c
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Jan 16 21:39:40 2024 +0100
Remove "-pedantic-errors" compilation flag from CoinMP
---
ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch | 133 +++++++++++++++++++++
ext_libraries/coinmp/makefile.mk | 2 +-
2 files changed, 134 insertions(+), 1 deletion(-)
diff --git a/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch b/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch
new file mode 100644
index 0000000000..5e150ed3de
--- /dev/null
+++ b/ext_libraries/coinmp/coinmp-1.7.6-nopedantic.patch
@@ -0,0 +1,133 @@
+diff -ru misc/CoinMP-1.7.6/BuildTools/coin.m4 misc/build/CoinMP-1.7.6/BuildTools/coin.m4
+--- misc/CoinMP-1.7.6/BuildTools/coin.m4 2013-12-04 01:55:24.000000000 +0100
++++ misc/build/CoinMP-1.7.6/BuildTools/coin.m4 2024-01-14 21:07:37.956268347 +0100
+@@ -407,7 +407,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+@@ -813,7 +812,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/Cbc/configure misc/build/CoinMP-1.7.6/Cbc/configure
+--- misc/CoinMP-1.7.6/Cbc/configure 2024-01-14 21:06:04.060145560 +0100
++++ misc/build/CoinMP-1.7.6/Cbc/configure 2024-01-14 21:06:52.980202550 +0100
+@@ -2898,7 +2898,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3780,7 +3779,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/Cgl/configure misc/build/CoinMP-1.7.6/Cgl/configure
+--- misc/CoinMP-1.7.6/Cgl/configure 2024-01-14 21:06:04.068145568 +0100
++++ misc/build/CoinMP-1.7.6/Cgl/configure 2024-01-14 21:07:21.892243444 +0100
+@@ -2868,7 +2868,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3750,7 +3749,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/Clp/configure misc/build/CoinMP-1.7.6/Clp/configure
+--- misc/CoinMP-1.7.6/Clp/configure 2024-01-14 21:06:04.072145571 +0100
++++ misc/build/CoinMP-1.7.6/Clp/configure 2024-01-14 21:08:12.220326395 +0100
+@@ -2895,7 +2895,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3777,7 +3776,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/CoinMP/configure misc/build/CoinMP-1.7.6/CoinMP/configure
+--- misc/CoinMP-1.7.6/CoinMP/configure 2024-01-14 21:06:04.076145576 +0100
++++ misc/build/CoinMP-1.7.6/CoinMP/configure 2024-01-14 21:08:41.532381126 +0100
+@@ -2837,7 +2837,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3719,7 +3718,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/CoinUtils/configure misc/build/CoinMP-1.7.6/CoinUtils/configure
+--- misc/CoinMP-1.7.6/CoinUtils/configure 2024-01-14 21:06:04.080145580 +0100
++++ misc/build/CoinMP-1.7.6/CoinUtils/configure 2024-01-14 21:09:04.552427204 +0100
+@@ -2894,7 +2894,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3776,7 +3775,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
+diff -ru misc/CoinMP-1.7.6/Osi/configure misc/build/CoinMP-1.7.6/Osi/configure
+--- misc/CoinMP-1.7.6/Osi/configure 2024-01-14 21:06:04.084145583 +0100
++++ misc/build/CoinMP-1.7.6/Osi/configure 2024-01-14 21:10:01.032550992 +0100
+@@ -2866,7 +2866,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+ ;;
+ esac
+ esac
+@@ -3748,7 +3747,6 @@
+ *-darwin*)
+ ;;
+ *)
+- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+ ;;
+ esac
+ esac
diff --git a/ext_libraries/coinmp/makefile.mk b/ext_libraries/coinmp/makefile.mk
index 3ec3c9a208..c4044b6114 100644
--- a/ext_libraries/coinmp/makefile.mk
+++ b/ext_libraries/coinmp/makefile.mk
@@ -45,7 +45,7 @@ all:
TARFILE_NAME=CoinMP-1.7.6
TARFILE_MD5=1cce53bf4b40ae29790d2c5c9f8b1129
-PATCH_FILES=coinmp-1.7.6.patch coinmp-1.7.6-clang.patch
+PATCH_FILES=coinmp-1.7.6.patch coinmp-1.7.6-clang.patch coinmp-1.7.6-nopedantic.patch
.IF "$(OS)"=="OS2"
PATCH_FILES+=coinmp-1.6.0-os2.patch
.ENDIF