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
