diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-02 09:51:03 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-02 09:51:03 +0000 |
| commit | f0e0fb446c4a54b5f11e811b1bab5c0028dcca5c (patch) | |
| tree | 512d43f3defd359b7ce5b9a72fbeda3a66ef036e /sci-libs/minuit | |
| parent | Taking over as maintainer (diff) | |
| download | gentoo-2-f0e0fb446c4a54b5f11e811b1bab5c0028dcca5c.tar.gz gentoo-2-f0e0fb446c4a54b5f11e811b1bab5c0028dcca5c.tar.bz2 gentoo-2-f0e0fb446c4a54b5f11e811b1bab5c0028dcca5c.zip | |
Adding workaround for bug 314095
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/minuit')
| -rw-r--r-- | sci-libs/minuit/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/minuit/files/minuit-5.27.02-asneeded.patch | 28 | ||||
| -rw-r--r-- | sci-libs/minuit/minuit-5.27.02.ebuild | 12 |
3 files changed, 42 insertions, 4 deletions
diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog index 519da4fc2951..32a1919f190b 100644 --- a/sci-libs/minuit/ChangeLog +++ b/sci-libs/minuit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/minuit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.11 2010/05/10 14:57:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.12 2010/06/02 09:51:02 xarthisius Exp $ + + 02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> minuit-5.27.02.ebuild, + +files/minuit-5.27.02-asneeded.patch: + Adding workaround for bug 314095 *minuit-5.27.02 (10 May 2010) diff --git a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch new file mode 100644 index 000000000000..ba5ab50d635d --- /dev/null +++ b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch @@ -0,0 +1,28 @@ +Workaround for as-needed failure. It's not a proper patch! +If you know how to do it better, please do! + +http://bugs.gentoo.org/show_bug.cgi?id=314095 + +--- src/Makefile.am ++++ src/Makefile.am +@@ -9,6 +9,10 @@ + # The convenience library to be built. + lib_LTLIBRARIES = libMinuit2.la + ++if GNUOPENMP ++ libMinuit2_la_LIBADD = -lgomp ++endif ++ + libMinuit2_la_SOURCES = \ + AnalyticalGradientCalculator.cxx \ + BasicMinimumError.cxx \ +--- configure.in ++++ configure.in +@@ -43,6 +43,7 @@ + AC_OPENMP + CFLAGS="$CFLAGS $OPENMP_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" ++AM_CONDITIONAL(GNUOPENMP, test "x$OPENMP_CXXFLAGS" = "x-fopenmp") + + dnl files to be generated + AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile diff --git a/sci-libs/minuit/minuit-5.27.02.ebuild b/sci-libs/minuit/minuit-5.27.02.ebuild index 3ba7b3492979..2b362aab4d04 100644 --- a/sci-libs/minuit/minuit-5.27.02.ebuild +++ b/sci-libs/minuit/minuit-5.27.02.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.27.02.ebuild,v 1.1 2010/05/10 14:57:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.27.02.ebuild,v 1.2 2010/06/02 09:51:02 xarthisius Exp $ EAPI=2 -inherit eutils toolchain-funcs +inherit autotools eutils toolchain-funcs MY_PN=Minuit2 @@ -16,7 +16,7 @@ SRC_URI="http://seal.web.cern.ch/seal/MathLibs/${MY_PN}/${MY_PN}-${PV}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="doc openmp" DEPEND="doc? ( app-doc/doxygen )" RDEPEND="" @@ -32,6 +32,12 @@ pkg_setup() { fi } +src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded.patch + rm config/m4/ac_openmp.m4 + AT_M4DIR="config/m4" eautoreconf +} + src_configure() { econf $(use_enable openmp) } |