public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
Date: Fri, 18 Jun 2021 21:07:38 +0000 (UTC)	[thread overview]
Message-ID: <1624050428.c2c24ad694d76c541d680eb671a34dd04838cbf4.soap@gentoo> (raw)

commit:     c2c24ad694d76c541d680eb671a34dd04838cbf4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:07:08 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:07:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c24ad6

games-simulation/pmars-sdl: use pkg-config to find ncurses, x11

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
index ae564aa94c0..df1ca5fb51e 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!sdl? ( !X? ( sys-libs/ncurses:0= ) )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
@@ -46,15 +47,15 @@ src_compile() {
 		append-cflags $(sdl-config --cflags)
 		append-cppflags -DSDLGRAPHX
 
-		LIB=$(sdl-config --libs)
+		LIB="$(sdl-config --libs)"
 	elif use X ; then
 		append-cppflags -DXWINGRAPHX
 
-		LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11"
+		LIB="$($(tc-getPKG_CONFIG) --libs x11)"
 	else
 		append-cppflags -DCURSESGRAPHX
 
-		LIB="-lcurses -ltinfo"
+		LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
 	fi
 
 	cd src || die


             reply	other threads:[~2021-06-18 21:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 21:07 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-18 21:07 [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/ David Seifert
2019-08-01 11:07 Stefan Strogin
2018-05-01 19:37 Pacho Ramos
2018-05-01 19:37 Pacho Ramos
2016-05-06 17:10 Michael Sterrett
2016-05-06  2:50 Michael Sterrett

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=1624050428.c2c24ad694d76c541d680eb671a34dd04838cbf4.soap@gentoo \
    --to=soap@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