summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-07-26 16:12:53 +0000
committerDan Armak <danarmak@gentoo.org>2002-07-26 16:12:53 +0000
commit9f3735f2d681fa22188d8710ae4661f4ae1dd309 (patch)
tree70fc87733ae58dfe13f5afd0afcf9681726acda0
parentditto for 3.1_alpha1: remove -fomit-frame-pointer flag from subdir kdm/kfront... (diff)
downloadgentoo-2-9f3735f2d681fa22188d8710ae4661f4ae1dd309.tar.gz
gentoo-2-9f3735f2d681fa22188d8710ae4661f4ae1dd309.tar.bz2
gentoo-2-9f3735f2d681fa22188d8710ae4661f4ae1dd309.zip
use the new kde_remove_flag function from kde-functions.eclass isntaed of basically implementing this functionality locally
-rw-r--r--app-office/koffice/koffice-1.1.1.ebuild24
-rw-r--r--app-office/koffice/koffice-1.2_beta2.ebuild22
2 files changed, 11 insertions, 35 deletions
diff --git a/app-office/koffice/koffice-1.1.1.ebuild b/app-office/koffice/koffice-1.1.1.ebuild
index 12930ee04b62..ff1da6aede4a 100644
--- a/app-office/koffice/koffice-1.1.1.ebuild
+++ b/app-office/koffice/koffice-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.1.ebuild,v 1.11 2002/07/16 02:29:19 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.1.ebuild,v 1.12 2002/07/26 16:12:53 danarmak Exp $
inherit kde-base || die
@@ -32,24 +32,12 @@ src_compile() {
myconf="$myconf --enable-all"
myconf="$myconf --with-extra-libs=/usr/lib/python2.2/config"
- kde_src_compile myconf
+ kde_src_compile myconf configure
export LIBPYTHON="`python-config --libs`"
#the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
- CXXFLAGS2="$CXXFLAGS"
- CFLAGS2="$CFLAGS"
-
- CFLAGS=${CFLAGS/-fomit-frame-pointer}
- CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
- cd ${S}
- kde_src_compile configure
- cd ${S}/kchart/kdchart
- make
-
- CFLAGS="$CFLAGS2"
- CXXFLAGS="$CXXFLAGS2"
- cd ${S}
- kde_src_compile configure
- make
-
+ kde_remove_flag kchart/kdchart -fomit-frame-pointer
+
+ kde_src_compile make
+
}
diff --git a/app-office/koffice/koffice-1.2_beta2.ebuild b/app-office/koffice/koffice-1.2_beta2.ebuild
index af75b63ee283..e0cadba41b55 100644
--- a/app-office/koffice/koffice-1.2_beta2.ebuild
+++ b/app-office/koffice/koffice-1.2_beta2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta2.ebuild,v 1.4 2002/07/16 02:29:19 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta2.ebuild,v 1.5 2002/07/26 16:12:53 danarmak Exp $
inherit kde-base || die
@@ -29,24 +29,12 @@ need-autoconf 2.5
src_compile() {
myconf="$myconf --enable-all"
- kde_src_compile myconf
+ kde_src_compile myconf configure
#the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
- CXXFLAGS2="$CXXFLAGS"
- CFLAGS2="$CFLAGS"
-
- CFLAGS=${CFLAGS/-fomit-frame-pointer}
- CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
- cd ${S}
- kde_src_compile configure
- cd ${S}/kchart/kdchart
- make
-
- CFLAGS="$CFLAGS2"
- CXXFLAGS="$CXXFLAGS2"
- cd ${S}
- kde_src_compile configure
- make
+ kde_remove_flag kchart/kdchart -fomit-frame-pointer
+ kde_src_compile make
+
}