* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinasl/files/, sci-libs/coinasl/
@ 2024-10-14 7:21 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2024-10-14 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 592794f0ebedcf34fe93f7d36df28acd4cf32a3f
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Wed Feb 14 03:21:56 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 07:19:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592794f0
sci-libs/coinasl: new package, add 2.0.1
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/coinasl/Manifest | 2 ++
sci-libs/coinasl/coinasl-2.0.1.ebuild | 34 ++++++++++++++++++++++
sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch | 11 +++++++
.../coinasl/files/coinasl-2.0.1-getrusage.patch | 13 +++++++++
sci-libs/coinasl/metadata.xml | 15 ++++++++++
5 files changed, 75 insertions(+)
diff --git a/sci-libs/coinasl/Manifest b/sci-libs/coinasl/Manifest
new file mode 100644
index 000000000000..c30f0c55f14a
--- /dev/null
+++ b/sci-libs/coinasl/Manifest
@@ -0,0 +1,2 @@
+DIST coinasl-2.0.1.tar.gz 252385 BLAKE2B 7276c9e4325542817a49c61b0d08b5d3bd60a4d9beb981fdd164fdad80d6695c6ba83c4c0cbddeac119be4572c1fe4f0534b0adcc45541324b23e7bc2d60a303 SHA512 37c05677ebc82d56228cd80382c37ae44546fd5681063488bd2cd3c35c2155c2f85e6e8fbcbe41913eeafeb3ac12d2972919893de75affade3016e64f75e034b
+DIST solvers-64919f75f.tgz 360043 BLAKE2B 08b81c638bc9154e3089a87409585dd8e6f64be48ef0e431e5d5e907f5fa7c21c755890baf480924c17e25e8da6220d90f9d3ad1aa3146f40134f4bde0ca9f06 SHA512 dfb001d1feb4218b3122f4d6fe7a101f03bbb8277e8af0adda6a1ae9295b6eb7fc1ef62550bc6cc724a54754c713e36f526555c66d9f0bcb9a08ed61414bbe26
diff --git a/sci-libs/coinasl/coinasl-2.0.1.ebuild b/sci-libs/coinasl/coinasl-2.0.1.ebuild
new file mode 100644
index 000000000000..633b07582ddf
--- /dev/null
+++ b/sci-libs/coinasl/coinasl-2.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Ampl Solver Library (ASL)"
+HOMEPAGE="https://github.com/coin-or-tools/ThirdParty-ASL"
+SOLVERS_SHA="64919f75f"
+SRC_URI="https://coin-or-tools.github.io/ThirdParty-ASL/solvers-${SOLVERS_SHA}.tgz
+ https://github.com/coin-or-tools/ThirdParty-ASL/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ThirdParty-ASL-releases-${PV}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+ "${FILESDIR}/${P}-getrusage.patch"
+ "${FILESDIR}/${P}-dtoa.patch"
+)
+
+src_unpack() {
+ default
+ mv solvers "${S}" || die
+}
+
+src_compile() {
+ econf --enable-shared
+}
+
+src_install() {
+ default
+ rm "${D}/usr/$(get_libdir)/libcoinasl.la" || die
+}
diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch
new file mode 100644
index 000000000000..72efc195307a
--- /dev/null
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch
@@ -0,0 +1,11 @@
+--- a/solvers/dtoa1.c
++++ b/solvers/dtoa1.c
+@@ -16,6 +16,8 @@
+ of or in connection with the use or performance of this software.
+ *******************************************************************/
+
++#include <stddef.h>
++
+ #ifndef No_dtoa /*{{*/
+ #ifdef __cplusplus
+ #include "memory.h"
diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
new file mode 100644
index 000000000000..54e8807dffae
--- /dev/null
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 59e033d..2544237 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ AM_CONDITIONAL([ASL_INT64],[test "$intsize" = 64])
+ # The critical function for NO_RUSAGE is getrusage(). Use a standard test.
+ AC_MSG_CHECKING([for getrusage])
+ AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM([[]],[[getrusage()]])],
++ [AC_LANG_PROGRAM(["#include <sys/resource.h>"],[[getrusage()]])],
+ [AC_MSG_RESULT([yes])],
+ [CPPFLAGS="$CPPFLAGS -DNO_RUSAGE"
+ AC_MSG_RESULT([no])])
diff --git a/sci-libs/coinasl/metadata.xml b/sci-libs/coinasl/metadata.xml
new file mode 100644
index 000000000000..c7297bcf168c
--- /dev/null
+++ b/sci-libs/coinasl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>audvare@gmail.com</email>
+ <name>Andrew Udvare</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">coin-or-tools/ThirdParty-ASL</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinasl/files/, sci-libs/coinasl/
@ 2024-10-21 12:08 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2024-10-21 12:08 UTC (permalink / raw
To: gentoo-commits
commit: 07bc74a917a14155521ad67fefd5f119353f8442
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Tue Oct 15 08:04:14 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 12:08:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bc74a9
sci-libs/coinasl: fix implicit declaration issue
- Correctly detect getrusage(). The patch was present before but eautoreconf was never run before
because it was failing due to missing includes. This is resolved by pulling in coin-or BuildTools.
- Move econf to the correct phase function.
Closes: https://bugs.gentoo.org/941516
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38997
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/coinasl/Manifest | 1 +
.../{coinasl-2.0.1.ebuild => coinasl-2.0.1-r1.ebuild} | 14 ++++++++++++--
sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/sci-libs/coinasl/Manifest b/sci-libs/coinasl/Manifest
index c30f0c55f14a..f2fee7a53866 100644
--- a/sci-libs/coinasl/Manifest
+++ b/sci-libs/coinasl/Manifest
@@ -1,2 +1,3 @@
+DIST coin-or-tools-BuildTools-20208f47f7bbc0056a92adefdfd43fded969f674.tar.gz 110238 BLAKE2B dd1965fd0a3aca6a1d0116d38c1c30edda1d2f38976ea919a4dd6e06da70171ab4a768e34a1320e7c8487c259968566aa94a585f36d96964296b2b5a240250ae SHA512 82b7f14f2ae735001d41b05b592914f4c1c710536a4ec5ed4db3aefa0f0ce181b90f44d6a91e6216d3c8dc87f760df2571837a062bf6aa3f3444a0d70f8a7a19
DIST coinasl-2.0.1.tar.gz 252385 BLAKE2B 7276c9e4325542817a49c61b0d08b5d3bd60a4d9beb981fdd164fdad80d6695c6ba83c4c0cbddeac119be4572c1fe4f0534b0adcc45541324b23e7bc2d60a303 SHA512 37c05677ebc82d56228cd80382c37ae44546fd5681063488bd2cd3c35c2155c2f85e6e8fbcbe41913eeafeb3ac12d2972919893de75affade3016e64f75e034b
DIST solvers-64919f75f.tgz 360043 BLAKE2B 08b81c638bc9154e3089a87409585dd8e6f64be48ef0e431e5d5e907f5fa7c21c755890baf480924c17e25e8da6220d90f9d3ad1aa3146f40134f4bde0ca9f06 SHA512 dfb001d1feb4218b3122f4d6fe7a101f03bbb8277e8af0adda6a1ae9295b6eb7fc1ef62550bc6cc724a54754c713e36f526555c66d9f0bcb9a08ed61414bbe26
diff --git a/sci-libs/coinasl/coinasl-2.0.1.ebuild b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
similarity index 66%
rename from sci-libs/coinasl/coinasl-2.0.1.ebuild
rename to sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
index 633b07582ddf..3a7e7ae257e8 100644
--- a/sci-libs/coinasl/coinasl-2.0.1.ebuild
+++ b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
@@ -3,11 +3,15 @@
EAPI=8
+inherit autotools
+
DESCRIPTION="Ampl Solver Library (ASL)"
HOMEPAGE="https://github.com/coin-or-tools/ThirdParty-ASL"
+BUILD_TOOLS_VERSION="20208f47f7bbc0056a92adefdfd43fded969f674"
SOLVERS_SHA="64919f75f"
SRC_URI="https://coin-or-tools.github.io/ThirdParty-ASL/solvers-${SOLVERS_SHA}.tgz
- https://github.com/coin-or-tools/ThirdParty-ASL/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz"
+ https://github.com/coin-or-tools/ThirdParty-ASL/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/coin-or-tools/BuildTools/archive/${BUILD_TOOLS_VERSION}.tar.gz -> coin-or-tools-BuildTools-${BUILD_TOOLS_VERSION}.tar.gz"
S="${WORKDIR}/ThirdParty-ASL-releases-${PV}"
LICENSE="EPL-1.0"
@@ -24,7 +28,13 @@ src_unpack() {
mv solvers "${S}" || die
}
-src_compile() {
+src_prepare() {
+ default
+ AT_M4DIR="${WORKDIR}/BuildTools-${BUILD_TOOLS_VERSION}"
+ eautoreconf
+}
+
+src_configure() {
econf --enable-shared
}
diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
index 54e8807dffae..9d6c193605bd 100644
--- a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
@@ -7,7 +7,7 @@ index 59e033d..2544237 100644
AC_MSG_CHECKING([for getrusage])
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],[[getrusage()]])],
-+ [AC_LANG_PROGRAM(["#include <sys/resource.h>"],[[getrusage()]])],
++ [AC_LANG_PROGRAM([#include <sys/resource.h>],[struct rusage r; getrusage(RUSAGE_SELF, &r)])],
[AC_MSG_RESULT([yes])],
[CPPFLAGS="$CPPFLAGS -DNO_RUSAGE"
AC_MSG_RESULT([no])])
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-21 12:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-14 7:21 [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinasl/files/, sci-libs/coinasl/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2024-10-21 12:08 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox