public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
Date: Tue, 10 Sep 2019 17:17:17 +0000 (UTC)	[thread overview]
Message-ID: <1568135820.19fd8f929f791c589312f4c54634bfdd6cb41d5f.tupone@gentoo> (raw)

commit:     19fd8f929f791c589312f4c54634bfdd6cb41d5f
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 17:17:00 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 17:17:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd8f92

media-libs/glm: respect EPREFIX

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 media-libs/glm/files/{glm.pc => glm.pc.in} |  4 ++--
 media-libs/glm/glm-0.9.9.6.ebuild          | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/media-libs/glm/files/glm.pc b/media-libs/glm/files/glm.pc.in
similarity index 64%
rename from media-libs/glm/files/glm.pc
rename to media-libs/glm/files/glm.pc.in
index e3bb5acc1af..fc5c7bb7f90 100644
--- a/media-libs/glm/files/glm.pc
+++ b/media-libs/glm/files/glm.pc.in
@@ -1,7 +1,7 @@
-prefix=/usr
+prefix=@CMAKE_INSTALL_PREFIX@
 includedir=${prefix}/include
 
 Name: GLM
 Description: OpenGL Mathematics
-Version: 0.9.9
+Version: @GLM_VERSION@
 Cflags: -I${includedir}

diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6.ebuild
index 8b84a358e2b..89d9894cf71 100644
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6.ebuild
@@ -16,6 +16,14 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86
 
 RDEPEND="virtual/opengl"
 
+src_prepare() {
+	cmake-utils_src_prepare
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:0.9.9:" \
+		"${FILESDIR}"/glm.pc.in > glm.pc || die
+}
+
 src_configure() {
 	if use test; then
 		local mycmakeargs=(
@@ -34,5 +42,5 @@ src_install() {
 	doheader -r glm
 	dodoc -r *md doc/*
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}"/glm.pc
+	doins glm.pc
 }


             reply	other threads:[~2019-09-10 17:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10 17:17 Alfredo Tupone [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-02-05 21:57 [gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/ Sam James
2020-07-07  6:51 Alfredo Tupone
2019-03-06 19:46 Alfredo Tupone

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=1568135820.19fd8f929f791c589312f4c54634bfdd6cb41d5f.tupone@gentoo \
    --to=tupone@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