diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-25 19:00:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-25 19:00:06 +0000 |
| commit | 3806dbb87051a08fc9521b0f99f82ad81c86daa4 (patch) | |
| tree | 5180f602f940bc68e451c978570ca3887f105150 /sci-biology | |
| parent | Bug #306677 - Fix invalid conditional USE dep. (diff) | |
| download | gentoo-2-3806dbb87051a08fc9521b0f99f82ad81c86daa4.tar.gz gentoo-2-3806dbb87051a08fc9521b0f99f82ad81c86daa4.tar.bz2 gentoo-2-3806dbb87051a08fc9521b0f99f82ad81c86daa4.zip | |
Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt #305547 by Kacper Kowalik.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/mira/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-biology/mira/files/mira-3.0.0-asneeded.patch | 56 | ||||
| -rw-r--r-- | sci-biology/mira/mira-3.0.0.ebuild | 3 |
3 files changed, 64 insertions, 2 deletions
diff --git a/sci-biology/mira/ChangeLog b/sci-biology/mira/ChangeLog index 60bd38326de7..e3d10b3a5912 100644 --- a/sci-biology/mira/ChangeLog +++ b/sci-biology/mira/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-biology/mira # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/ChangeLog,v 1.3 2010/02/03 15:57:25 weaver Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/ChangeLog,v 1.4 2010/02/25 19:00:05 ssuominen Exp $ + + 25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> mira-3.0.0.ebuild, + +files/mira-3.0.0-asneeded.patch: + Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt + #305547 by Kacper Kowalik. 03 Feb 2010; Andrey Kislyuk <weaver@gentoo.org> mira-3.0.0.ebuild: add eautoreconf diff --git a/sci-biology/mira/files/mira-3.0.0-asneeded.patch b/sci-biology/mira/files/mira-3.0.0-asneeded.patch new file mode 100644 index 000000000000..d1b797006051 --- /dev/null +++ b/sci-biology/mira/files/mira-3.0.0-asneeded.patch @@ -0,0 +1,56 @@ +http://bugs.gentoo.org/show_bug.cgi?id=305547 + +--- config/m4/ax_lib_expat.m4 ++++ config/m4/ax_lib_expat.m4 +@@ -96,6 +99,7 @@ + + EXPAT_CFLAGS="" + EXPAT_LDFLAGS="" ++ EXPAT_LIBS="" + EXPAT_VERSION="" + + dnl +@@ -105,7 +109,8 @@ + + if test -n "$expat_prefix"; then + expat_include_dir="$expat_prefix/include" +- expat_lib_flags="-L$expat_prefix/lib -lexpat" ++ expat_lib_flags="-L$expat_prefix/lib" ++ expat_libs="-lexpat" + run_expat_test="yes" + elif test "$expat_requested" = "yes"; then + if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then +@@ -126,6 +131,8 @@ + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $expat_lib_flags" + ++ saved_LIBS="$LIBSS" ++ LIBS="$LIBS $expat_libs" + dnl + dnl Check Expat headers + dnl +@@ -171,7 +178,8 @@ + ]] + )], + [ + EXPAT_LDFLAGS="$expat_lib_flags" ++ EXPAT_LIBS="$expat_libs" + expat_lib_found="yes" + AC_MSG_RESULT([found]) + ], +@@ -185,6 +193,7 @@ + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" ++ LIBS="$saved_LIBS" + fi + + AC_MSG_CHECKING([for Expat XML Parser]) +@@ -194,6 +203,7 @@ + + AC_SUBST([EXPAT_CFLAGS]) + AC_SUBST([EXPAT_LDFLAGS]) ++ AC_SUBST([EXPAT_LIBS]) + + HAVE_EXPAT="yes" + else diff --git a/sci-biology/mira/mira-3.0.0.ebuild b/sci-biology/mira/mira-3.0.0.ebuild index 538ef1eab18a..d112bee41571 100644 --- a/sci-biology/mira/mira-3.0.0.ebuild +++ b/sci-biology/mira/mira-3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.0.0.ebuild,v 1.3 2010/02/03 15:57:25 weaver Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.0.0.ebuild,v 1.4 2010/02/25 19:00:05 ssuominen Exp $ EAPI="2" @@ -26,6 +26,7 @@ RDEPEND="${CDEPEND}" src_prepare() { find -name 'configure*' -or -name 'Makefile*' | xargs sed -i 's/flex++/flex -+/' || die + epatch "${FILESDIR}"/${P}-asneeded.patch AT_M4DIR="config/m4" eautoreconf } |