public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gam-server/
Date: Wed, 19 Aug 2015 19:40:39 +0000 (UTC)	[thread overview]
Message-ID: <1440013205.ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d.grobian@gentoo> (raw)

commit:     ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 19:38:01 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 19:40:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffaa7c1e

app-admin/gam-server: Fix for Prefix and Solaris

Package-Manager: portage-2.2.20-prefix

 app-admin/gam-server/gam-server-0.1.10-r2.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 5ca1a58..a699932 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
@@ -67,8 +67,12 @@ src_configure() {
 	# fixes bug 225403
 	#append-flags "-D_GNU_SOURCE"
 
+	# Solaris' patchs adds this to configure, but it conflicts with
+	# Gentoo's FreeBSD patch.
+	[[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
+
 	if ! has_version virtual/pkgconfig; then
-		export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
+		export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
 		export DAEMON_LIBS="-lglib-2.0"
 	fi
 


             reply	other threads:[~2015-08-19 19:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-19 19:40 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-06-22 11:48 [gentoo-commits] repo/gentoo:master commit in: app-admin/gam-server/ Alexis Ballier
2018-07-15 13:20 Mart Raudsepp
2021-07-12 14:33 Marek Szuba
2021-11-22 20:23 Marek Szuba
2022-02-19  9:03 Arthur Zamarin
2022-02-19  9:53 Arthur Zamarin
2022-02-19 12:52 Arthur Zamarin
2022-02-19 13:15 Jakov Smolić
2022-02-19 13:22 Jakov Smolić
2022-02-19 13:47 Arthur Zamarin
2022-02-19 15:10 Arthur Zamarin
2022-02-20  5:27 Sam James

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=1440013205.ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d.grobian@gentoo \
    --to=grobian@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