diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-07-18 15:06:27 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-07-18 15:06:27 +0000 |
| commit | 05bf84f7b198396f6e1dc4063653fcdd49d4ffa8 (patch) | |
| tree | e074fcf542df10a3e8ea1ad0228fbf558076715f | |
| parent | Add RTCW license (diff) | |
| download | historical-05bf84f7b198396f6e1dc4063653fcdd49d4ffa8.tar.gz historical-05bf84f7b198396f6e1dc4063653fcdd49d4ffa8.tar.bz2 historical-05bf84f7b198396f6e1dc4063653fcdd49d4ffa8.zip | |
handle overrides for configure options
| -rw-r--r-- | eclass/commonbox.eclass | 19 | ||||
| -rw-r--r-- | eclass/xfree.eclass | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass index fcbae30175c2..72f6577dd6b4 100644 --- a/eclass/commonbox.eclass +++ b/eclass/commonbox.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.23 2003/06/02 23:38:29 mkeadle Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.24 2003/07/18 15:06:27 seemant Exp $ # # Author: Seemant Kulleen <seemant@gentoo.org> # @@ -25,6 +25,7 @@ RDEPEND="nls? ( sys-devel/gettext ) PROVIDE="virtual/blackbox" myconf="" +MYCONF="" mydoc="" BOOTSTRAP="" FORCEXFT="" @@ -94,10 +95,18 @@ commonbox_src_compile() { && myconf="${myconf} --enable-xft" \ || myconf="${myconf} --disable-xft" - econf \ - --sysconfdir=/etc/X11/${MYBIN} \ - --datadir=/usr/share/commonbox \ - ${myconf} || die + if [ -z "${MYCONF}" ] + then + econf \ + --sysconfdir=/etc/X11/${MYBIN} \ + --datadir=/usr/share/commonbox \ + ${myconf} || die + else + econf \ + --sysconfdir=/etc/X11/${MYBIN} \ + --datadir=/usr/share/commonbox \ + ${myconf} ${MYCONF} || die + fi [ ! -z "${FORCEXFT}" ] && echo "#define XFT 1" >> ${S}/config.h diff --git a/eclass/xfree.eclass b/eclass/xfree.eclass index 2ce856bb614e..ccbda05029ed 100644 --- a/eclass/xfree.eclass +++ b/eclass/xfree.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/xfree.eclass,v 1.2 2003/06/30 06:12:29 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xfree.eclass,v 1.3 2003/07/18 15:06:27 seemant Exp $ # # Author: Seemant Kulleen <seemant@gentoo.org> # @@ -21,3 +21,7 @@ vcards() { has "$1" "${VIDEO_CARDS}" && return 0 return 1 } + +filter-patch() { + mv ${PATCH_DIR}/"*${1}* ${PATCH_DIR}/excluded +} |