diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2009-12-15 23:26:12 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2009-12-15 23:26:12 +0000 |
| commit | f2ba7b6e5716dbd61558d8c3c77c3ec67b819a93 (patch) | |
| tree | dccfd4d18edeea347f624bff8d055a9e1200f3ab /sci-visualization/hippodraw | |
| parent | Version bump dev-haskell/hunit. (diff) | |
| download | gentoo-2-f2ba7b6e5716dbd61558d8c3c77c3ec67b819a93.tar.gz gentoo-2-f2ba7b6e5716dbd61558d8c3c77c3ec67b819a93.tar.bz2 gentoo-2-f2ba7b6e5716dbd61558d8c3c77c3ec67b819a93.zip | |
Added patch to fix configure issues with autoconf-2.64 and later (fixes #294376).
(Portage version: 2.1.7.14/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/hippodraw')
| -rw-r--r-- | sci-visualization/hippodraw/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch | 42 | ||||
| -rw-r--r-- | sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild | 3 |
3 files changed, 50 insertions, 2 deletions
diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog index 48eacc5cd184..cab61eaf0a45 100644 --- a/sci-visualization/hippodraw/ChangeLog +++ b/sci-visualization/hippodraw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/hippodraw # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.13 2009/11/13 03:45:51 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.14 2009/12/15 23:26:12 markusle Exp $ + + 15 Dec 2009; Markus Dittrich <markusle@gentoo.org> + hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-autoconf-2.64.patch: + Added patch to fix configure issues with autoconf-2.64 and later (fixes + #294376). 13 Nov 2009; Markus Dittrich <markusle@gentoo.org> hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-gcc4.4.patch: diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch new file mode 100644 index 000000000000..211e61033b71 --- /dev/null +++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch @@ -0,0 +1,42 @@ +diff -Naur HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 HippoDraw-1.21.3/config/m4/bnv_have_qt.m4 +--- HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 2006-12-08 14:15:35.000000000 -0500 ++++ HippoDraw-1.21.3/config/m4/bnv_have_qt.m4 2009-12-15 18:15:24.000000000 -0500 +@@ -438,8 +438,8 @@ + bnv_save_CXXFLAGS="$CXXFLAGS" + echo "Saved cxxflgs" + CXXFLAGS="-I$bnv_qt_include_dir" +- AC_TRY_LINK([#include <$qt_direct_test_header>], +- $qt_direct_test_main, ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]], ++ [[$qt_direct_test_main]])], + [ + # Success. + # We can link with no special library directory. +@@ -460,8 +460,8 @@ + echo "Non-critical error, please neglect the above." >&AC_FD_CC + bnv_qt_lib=qt-gl + LIBS="-l$bnv_qt_lib" +- AC_TRY_LINK([#include <$qt_direct_test_header>], +- $qt_direct_test_main, ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]], ++ [[$qt_direct_test_main]])], + [ + # Success. + # We can link with no special library directory. +@@ -496,14 +496,12 @@ + done + # Try with that one + LIBS="-l$bnv_qt_libS" +- AC_TRY_LINK([#include <$qt_direct_test_header>], +- $qt_direct_test_main, ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]], ++ [[$qt_direct_test_main]])], + [ + # Success. + # We can link with no special library directory. + bnv_qt_lib_dir= +- ], [ +- # Leave bnv_qt_lib_dir defined + ]) + ]) + ]) diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild index 8fb31d238ad1..5bf36d031b5b 100644 --- a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild +++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.8 2009/11/13 03:45:51 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.9 2009/12/15 23:26:12 markusle Exp $ EAPI=2 @@ -53,6 +53,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-minuit2.patch epatch "${FILESDIR}"/${P}-wcslib.patch epatch "${FILESDIR}"/${P}-qt4.patch + epatch "${FILESDIR}"/${P}-autoconf-2.64.patch # fix the install doc directory to gentoo's one local docdir=/usr/share/doc/${PF} |