diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-20 04:55:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-20 04:55:55 +0000 |
| commit | 0a531783cd7e429d0994f6904cc7dcec37c2bd19 (patch) | |
| tree | bb4ef6602dfd1ad729fca0a13984fd7b929018f5 /app-i18n/bidiv | |
| parent | old (diff) | |
| download | gentoo-2-0a531783cd7e429d0994f6904cc7dcec37c2bd19.tar.gz gentoo-2-0a531783cd7e429d0994f6904cc7dcec37c2bd19.tar.bz2 gentoo-2-0a531783cd7e429d0994f6904cc7dcec37c2bd19.zip | |
Remove forced -O2 and use environment LDFLAGS wrt #341791 by Diego Elio Pettenò. Edit -fribidi.patch because it was patching Makefile as-is.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/bidiv')
| -rw-r--r-- | app-i18n/bidiv/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/bidiv/bidiv-1.5-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-i18n/bidiv/files/bidiv-1.5-fribidi.patch | 35 |
3 files changed, 32 insertions, 19 deletions
diff --git a/app-i18n/bidiv/ChangeLog b/app-i18n/bidiv/ChangeLog index 25925052ff02..055ff7f827aa 100644 --- a/app-i18n/bidiv/ChangeLog +++ b/app-i18n/bidiv/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-i18n/bidiv # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/bidiv/ChangeLog,v 1.18 2012/05/20 04:44:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/bidiv/ChangeLog,v 1.19 2012/05/20 04:55:54 ssuominen Exp $ + + 20 May 2012; Samuli Suominen <ssuominen@gentoo.org> bidiv-1.5-r1.ebuild, + files/bidiv-1.5-fribidi.patch: + Remove forced -O2 and use environment LDFLAGS wrt #341791 by Diego Elio + Pettenò. Edit -fribidi.patch because it was patching Makefile as-is. 20 May 2012; Samuli Suominen <ssuominen@gentoo.org> -bidiv-1.4.ebuild, -bidiv-1.5.ebuild: diff --git a/app-i18n/bidiv/bidiv-1.5-r1.ebuild b/app-i18n/bidiv/bidiv-1.5-r1.ebuild index abc88e3f00b5..aeef13ddf1c6 100644 --- a/app-i18n/bidiv/bidiv-1.5-r1.ebuild +++ b/app-i18n/bidiv/bidiv-1.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/bidiv/bidiv-1.5-r1.ebuild,v 1.4 2012/05/20 04:41:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/bidiv/bidiv-1.5-r1.ebuild,v 1.5 2012/05/20 04:55:54 ssuominen Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~ppc ~sparc x86" IUSE="" -RDEPEND="dev-libs/fribidi" +RDEPEND=">=dev-libs/fribidi-0.19.2-r2" DEPEND="${DEPEND} virtual/pkgconfig" @@ -24,10 +24,9 @@ src_prepare() { epatch "${FILESDIR}"/${P}-fribidi.patch } -src_configure() { :; } - src_compile() { - emake CC="$(tc-getCC)" CC_OPT_FLAGS="${CFLAGS}" + tc-export CC + emake } src_install() { diff --git a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch index f07d3b426096..0223329cbe5e 100644 --- a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch +++ b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch @@ -1,16 +1,3 @@ ---- Makefile -+++ Makefile -@@ -4,8 +4,8 @@ - CC_OPT_FLAGS=-O2 -Wall - - --CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags` --LDFLAGS=`fribidi-config --libs` -+CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `pkg-config fribidi --cflags` -+LDFLAGS=`pkg-config fribidi --libs` - - all: bidiv - --- bidiv.c +++ bidiv.c @@ -172,7 +172,7 @@ @@ -35,3 +22,25 @@ out); /* if rtl_line (i.e., base_dir is RL), and we didn't fill the entire width, we need to pad with spaces. Maybe in the +--- Makefile ++++ Makefile +@@ -1,16 +1,14 @@ + PREFIX=/usr/local + BIN_DIR=$(PREFIX)/bin + MAN_PATH=$(PREFIX)/man +-CC_OPT_FLAGS=-O2 -Wall + +- +-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags` +-LDFLAGS=`fribidi-config --libs` ++CFLAGS+=`pkg-config fribidi --cflags` -Wall ++LIBS=`pkg-config fribidi --libs` + + all: bidiv + + bidiv: bidiv.o +- $(CC) -o bidiv bidiv.o $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS) + + clean: + rm -f bidiv.o *~ |