| 1 |
commit: aba80c258a5c7e4f3a1dd22b61b67b1507377dac |
| 2 |
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com> |
| 3 |
AuthorDate: Wed May 25 08:40:50 2016 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 25 08:40:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aba80c25 |
| 7 |
|
| 8 |
sys-devel/gettext: really deactivate included libintl |
| 9 |
|
| 10 |
sys-devel/gettext/gettext-0.19.7.ebuild | 9 +++++++-- |
| 11 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild |
| 14 |
index ba8005d..924f9a3 100644 |
| 15 |
--- a/sys-devel/gettext/gettext-0.19.7.ebuild |
| 16 |
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild |
| 17 |
@@ -61,6 +61,13 @@ src_prepare() { |
| 18 |
|
| 19 |
epunt_cxx |
| 20 |
elibtoolize |
| 21 |
+ |
| 22 |
+ # Never build libintl since it's in dev-libs/libintl now. |
| 23 |
+ einfo "Deactivating included intl library ..." |
| 24 |
+ sed -i -e \ |
| 25 |
+ '/gt_use_preinstalled_gnugettext=yes/s/^/:;fi;if :;then /' \ |
| 26 |
+ gettext-{runtime,tools}/configure || die |
| 27 |
+ eend $? |
| 28 |
} |
| 29 |
|
| 30 |
multilib_src_configure() { |
| 31 |
@@ -79,8 +86,6 @@ multilib_src_configure() { |
| 32 |
# this will _disable_ libunistring (since it is not bundled), |
| 33 |
# see bug #326477 |
| 34 |
--with-included-libunistring |
| 35 |
- # Never build libintl since it's in dev-libs/libintl now. |
| 36 |
- --without-included-gettext |
| 37 |
|
| 38 |
$(use_enable acl) |
| 39 |
$(use_enable cxx c++) |
Archives