From 5548eb3ff2338e30befce1613f1be74a6c015c4c Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 15 Jan 2005 13:49:52 +0000 Subject: [PATCH] Make openmotif friendly with multilib includes... Package-Manager: portage-2.0.51-r12 --- x11-libs/openmotif/openmotif-2.1.30-r4.ebuild | 9 +++++++-- x11-libs/openmotif/openmotif-2.1.30-r5.ebuild | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild index f02748a7412c..b580ccb4750d 100644 --- a/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild +++ b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild,v 1.12 2004/11/18 08:57:15 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild,v 1.13 2005/01/15 13:47:49 eradicator Exp $ inherit eutils @@ -26,6 +26,11 @@ SLOT="0" inherit flag-o-matic replace-flags "-mcpu=athlon-xp" "-mcpu=i686" +pkg_setup() { + # multilib includes don't work right in this package... + [ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}" +} + src_unpack() { local cfg="${S}/config/cf/site.def" diff --git a/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild index bab3a622b222..3282235e0bb0 100644 --- a/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild +++ b/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild,v 1.20 2004/11/18 17:31:36 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild,v 1.21 2005/01/15 13:47:49 eradicator Exp $ inherit eutils flag-o-matic @@ -19,6 +19,11 @@ DEPEND="virtual/libc virtual/x11 >=sys-apps/sed-4" +pkg_setup() { + # multilib includes don't work right in this package... + [ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}" +} + src_unpack() { local cfg="${S}/config/cf/site.def" -- 2.26.2