diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-04-27 21:06:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-04-27 21:06:57 +0000 |
| commit | 3dccf5124a7497529b4164104dfd2ddd286ff654 (patch) | |
| tree | 1a54b1da684530eafcb2ee7efef7ef56e7cd376c /net-libs/libqmi | |
| parent | Refresh live ebuild. (diff) | |
| download | gentoo-2-3dccf5124a7497529b4164104dfd2ddd286ff654.tar.gz gentoo-2-3dccf5124a7497529b4164104dfd2ddd286ff654.tar.bz2 gentoo-2-3dccf5124a7497529b4164104dfd2ddd286ff654.zip | |
Fix building with newer automake #467326 by Mauro Crociara.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-libs/libqmi')
| -rw-r--r-- | net-libs/libqmi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libqmi/libqmi-1.0.0.ebuild | 11 | ||||
| -rw-r--r-- | net-libs/libqmi/libqmi-9999.ebuild | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/net-libs/libqmi/ChangeLog b/net-libs/libqmi/ChangeLog index e81352069e6f..a0834d4820f6 100644 --- a/net-libs/libqmi/ChangeLog +++ b/net-libs/libqmi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libqmi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.4 2013/01/29 00:50:44 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.5 2013/04/27 21:06:57 vapier Exp $ + + 27 Apr 2013; Mike Frysinger <vapier@gentoo.org> libqmi-1.0.0.ebuild, + libqmi-9999.ebuild: + Fix building with newer automake #467326 by Mauro Crociara. 29 Jan 2013; Zac Medico <zmedico@gentoo.org> Manifest: Update Manifest with digests for a snapshot which I've manually uploaded to diff --git a/net-libs/libqmi/libqmi-1.0.0.ebuild b/net-libs/libqmi/libqmi-1.0.0.ebuild index 5c0161bd0ca6..9e04cda9280d 100644 --- a/net-libs/libqmi/libqmi-1.0.0.ebuild +++ b/net-libs/libqmi/libqmi-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.0.0.ebuild,v 1.1 2013/01/28 23:21:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.0.0.ebuild,v 1.2 2013/04/27 21:06:57 vapier Exp $ EAPI="4" @@ -26,11 +26,18 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - [[ -e configure ]] || eautoreconf + if [[ ! -e configure ]] ; then + find -name Makefile.am -exec sed -i 's:^INCLUDES:AM_CPPFLAGS:' {} + || die + sed -i \ + -e 's:noinst_PROGRAMS:check_PROGRAMS:' \ + {cli/test,libqmi-glib/test}/Makefile.am || die + eautoreconf + fi } src_configure() { econf \ + --disable-more-warnings \ $(use_enable static{-libs,}) \ $(use_with doc{,s}) \ $(use_with test{,s}) diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild index 4ae7f4411c1e..40f59128bf7f 100644 --- a/net-libs/libqmi/libqmi-9999.ebuild +++ b/net-libs/libqmi/libqmi-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.2 2013/01/28 23:21:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.3 2013/04/27 21:06:57 vapier Exp $ EAPI="4" @@ -31,6 +31,7 @@ src_prepare() { src_configure() { econf \ + --disable-more-warnings \ $(use_enable static{-libs,}) \ $(use_with doc{,s}) \ $(use_with test{,s}) |