public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
Date: Wed, 31 Mar 2021 13:05:42 +0000 (UTC)	[thread overview]
Message-ID: <1617195830.a36cbeb1287c096d09464f527fd9ce6c4450155a.mjo@gentoo> (raw)

commit:     a36cbeb1287c096d09464f527fd9ce6c4450155a
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 12:57:15 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 13:03:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36cbeb1

sci-mathematics/glpk: don't install build artifacts with USE=examples.

The build system for glpk automatically descends into the "examples"
directory to build an example program. Afterwards, when we install
the entire "examples" directory to honor USE=examples, we wind up
installing the build artifacts for that program as well.

This commit adds an extra "emake clean" to remove the build artifacts,
and an "rm" to get rid of the (useless, to the end user) example
Makefiles themselves.

Closes: https://bugs.gentoo.org/779358
Reported-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../glpk/{glpk-5.0.ebuild => glpk-5.0-r1.ebuild}         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sci-mathematics/glpk/glpk-5.0.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
similarity index 76%
rename from sci-mathematics/glpk/glpk-5.0.ebuild
rename to sci-mathematics/glpk/glpk-5.0-r1.ebuild
index c91cdf6a34a..8bf55ceb4aa 100644
--- a/sci-mathematics/glpk/glpk-5.0.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
 		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
 
 	default
+
 	eautoreconf
 }
 
@@ -64,11 +65,26 @@ src_configure() {
 
 src_install() {
 	default
+
 	if use examples; then
+		# The top-level Makefile descends into the "examples" directory
+		# unconditionally, building a program and excreting build
+		# artifacts that we don't want to install. Note: this still
+		# leaves the example program /usr/bin/glpsol installed. An
+		# additional "emake ... uninstall" could probably take care
+		# of that if desired.
+		emake -C examples clean
+
+		# Installing the Makefiles for the examples does the user no
+		# good without the top-level Makefile.
+		rm examples/Makefile{.in,.am,} \
+			|| die "failed to remove example Makefiles"
+
 		insinto "/usr/share/doc/${PF}"
 		doins -r examples
 		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
+
 	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
 
 	# no static archives


             reply	other threads:[~2021-03-31 13:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-31 13:05 Michael Orlitzky [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-16 14:22 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/ Michael Orlitzky
2024-11-20  4:16 Michael Orlitzky
2024-03-05  4:48 Sam James
2024-01-10 18:24 Michael Orlitzky
2023-06-03 11:15 Arthur Zamarin
2022-12-04  9:23 WANG Xuerui
2022-10-18  2:18 Sam James
2021-11-02 22:21 Sam James
2021-11-02 22:21 Sam James
2021-11-02 15:47 Sam James
2021-11-02 15:47 Sam James
2021-11-02 15:46 Sam James
2021-11-02 15:46 Sam James
2021-11-02 15:46 Sam James
2021-07-14 16:15 Marek Szuba
2021-01-06 15:19 Fabian Groffen
2020-12-17  1:18 Michael Orlitzky
2020-11-07 17:57 Sam James
2020-11-06 15:23 Sam James
2020-08-23 17:01 David Seifert
2020-04-13 16:12 Agostino Sarubbo
2020-04-13 14:48 Agostino Sarubbo
2020-04-13 10:19 Agostino Sarubbo
2020-04-13 10:17 Agostino Sarubbo
2020-04-13  8:05 Sergei Trofimovich
2020-04-11 15:57 Sergei Trofimovich
2020-03-07  2:23 Michael Orlitzky
2018-07-13 10:43 Tony Vroon
2018-04-18 12:18 Tobias Klausmann
2018-04-04 22:32 Sergei Trofimovich
2018-03-03 17:56 Sergei Trofimovich
2017-12-16 13:07 Sergei Trofimovich
2017-12-16  8:20 Tobias Klausmann
2017-12-12 18:39 Thomas Deutschmann
2017-11-08 22:27 Sergei Trofimovich
2017-09-02 16:07 Sergei Trofimovich
2017-07-01  9:52 Sergei Trofimovich
2017-07-01  9:52 Sergei Trofimovich
2017-06-22 11:48 Alexis Ballier
2017-03-07  0:20 Sebastien Fabbro
2017-03-07  0:17 Sebastien Fabbro
2017-03-06 18:15 Robin H. Johnson
2017-03-04  0:10 Sebastien Fabbro
2016-01-23 11:05 Fabian Groffen

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=1617195830.a36cbeb1287c096d09464f527fd9ce6c4450155a.mjo@gentoo \
    --to=mjo@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