public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mark Wright" <gienah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/
Date: Sun, 21 Jun 2020 14:11:49 +0000 (UTC)	[thread overview]
Message-ID: <1592748270.e364e1fc6dc01eb6078974cce77c26a12d5ac5e0.gienah@gentoo> (raw)

commit:     e364e1fc6dc01eb6078974cce77c26a12d5ac5e0
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 14:04:30 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 14:04:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364e1fc

sci-libs/nlopt: Fix USE=static-libs

Need to multibuild it again to obtain the libnlopt.a, and install it.

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2.ebuild | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
index f21aa295b04..ec04d41e8bc 100644
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -49,16 +49,21 @@ src_configure() {
 	)
 	if use python; then
 		python_foreach_impl run_in_build_dir cmake_src_configure
-	else
-		cmake_src_configure
+	fi
+	if use static-libs; then
+		mycmakeargs+=(
+			-DBUILD_SHARED_LIBS=OFF
+		)
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
 	fi
 }
 
 src_compile() {
 	if use python; then
 		python_foreach_impl run_in_build_dir cmake_src_compile
-	else
-		cmake_src_compile
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
 	fi
 }
 
@@ -74,8 +79,9 @@ src_test() {
 	}
 	if use python; then
 		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
 	fi
 }
 
@@ -87,8 +93,9 @@ nlopt_install() {
 src_install() {
 	if use python; then
 		python_foreach_impl run_in_build_dir nlopt_install
-	else
-		cmake_src_install
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
 	fi
 	local r
 	for r in */README; do newdoc ${r} README.$(dirname ${r}); done


             reply	other threads:[~2020-06-21 14:11 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-21 14:11 Mark Wright [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-08 10:59 [gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/ Sam James
2024-11-08  3:54 Sam James
2024-09-28 14:43 Sam James
2024-06-04 20:21 Andrew Ammerlaan
2024-04-08 18:50 Andrew Ammerlaan
2024-03-02 14:55 Arthur Zamarin
2024-01-11  9:38 Sam James
2024-01-10 12:31 Jakov Smolić
2024-01-10 12:10 Sam James
2023-03-19  3:22 Sam James
2023-03-07 11:42 Sam James
2023-03-04  7:37 Arthur Zamarin
2023-02-24 11:24 Andrew Ammerlaan
2022-09-12 20:31 Michael Orlitzky
2022-09-12 20:31 Michael Orlitzky
2022-07-22  7:49 Agostino Sarubbo
2022-07-22  7:43 Agostino Sarubbo
2022-07-18 20:07 Sam James
2022-07-09 12:17 Agostino Sarubbo
2022-07-09 12:14 Agostino Sarubbo
2022-05-18  1:36 Michael Orlitzky
2021-10-25 17:20 Arthur Zamarin
2020-12-14  0:46 Sam James
2020-07-21  9:42 Andreas Sturmlechner
2020-07-21  9:33 Agostino Sarubbo
2020-07-21  8:48 Agostino Sarubbo
2020-06-22  1:41 Mark Wright
2020-06-21 14:11 Mark Wright
2020-06-21  4:54 Mark Wright
2020-01-22 21:50 Michał Górny
2020-01-16  7:03 Michał Górny
2017-04-20 16:41 David Seifert
2016-12-20 16:52 Tobias Klausmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1592748270.e364e1fc6dc01eb6078974cce77c26a12d5ac5e0.gienah@gentoo \
    --to=gienah@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox