| 1 |
commit: 34adbf714860fb2c1f167181de149ccd01e14efc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 6 03:44:28 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 6 03:49:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34adbf71 |
| 7 |
|
| 8 |
sci-libs/coinor-vol: fix build w/ musl 1.2.3 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/841746 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild | 6 +++++- |
| 14 |
.../files/coinor-vol-1.5.4-musl-1.2.3-null.patch | 24 ++++++++++++++++++++++ |
| 15 |
2 files changed, 29 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild |
| 18 |
index 53276b0f38c4..5ea2c976d627 100644 |
| 19 |
--- a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild |
| 20 |
+++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2020 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}" |
| 28 |
|
| 29 |
S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}" |
| 30 |
|
| 31 |
+PATCHES=( |
| 32 |
+ "${FILESDIR}"/${P}-musl-1.2.3-null.patch |
| 33 |
+) |
| 34 |
+ |
| 35 |
src_prepare() { |
| 36 |
# Needed to make the --with-coin-instdir in src_configure happy. |
| 37 |
dodir /usr |
| 38 |
|
| 39 |
diff --git a/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch b/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch |
| 40 |
new file mode 100644 |
| 41 |
index 000000000000..96a154740ed4 |
| 42 |
--- /dev/null |
| 43 |
+++ b/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch |
| 44 |
@@ -0,0 +1,24 @@ |
| 45 |
+https://bugs.gentoo.org/841746 |
| 46 |
+https://github.com/coin-or/Vol/commit/7b65983cfbf66f9a615c1babcc28a7cd87eee3c4 |
| 47 |
+ |
| 48 |
+From: Stefan Vigerske <svigerske@××××.com> |
| 49 |
+Date: Sat, 1 Feb 2020 17:45:41 +0000 |
| 50 |
+Subject: [PATCH] there should be no need to cast NULL, closes #1 |
| 51 |
+ |
| 52 |
+--- a/src/OsiVol/OsiVolSolverInterfaceIO.cpp |
| 53 |
++++ b/src/OsiVol/OsiVolSolverInterfaceIO.cpp |
| 54 |
+@@ -423,10 +423,10 @@ OsiVolSolverInterface::writeMps(const char *filename, |
| 55 |
+ writer.setMpsData(*getMatrixByCol(), getInfinity(), |
| 56 |
+ getColLower(), getColUpper(), |
| 57 |
+ getObjCoefficients(), |
| 58 |
+- reinterpret_cast<const char *> (NULL) /*integrality*/, |
| 59 |
++ NULL /*integrality*/, |
| 60 |
+ getRowLower(), getRowUpper(), |
| 61 |
+- reinterpret_cast<const char **> (NULL) /*colnam*/, |
| 62 |
+- reinterpret_cast<const char **> (NULL) /*rownam*/); |
| 63 |
++ NULL /*colnam*/, |
| 64 |
++ NULL /*rownam*/); |
| 65 |
+ std::string fname = filename; |
| 66 |
+ if (extension) |
| 67 |
+ { if (extension[0] != '\0' && extension[0] != '.') |
| 68 |
+ |
Archives