diff options
| author |   Sébastien Fabbro <bicatali@gentoo.org> | 2014-05-06 16:11:14 -0700 |
|---|---|---|
| committer | Sébastien Fabbro <bicatali@gentoo.org> | 2014-05-06 16:11:14 -0700 |
| commit | f73ae7dd317ffab84687e59e4458d8e42c4d9b66 (patch) | |
| tree | 2eb7d91cfb9b76e91fc9512a5ba552d94e80f0dd | |
| parent | sci-physics/thepeg: Version bump (diff) | |
| download | sci-f73ae7dd317ffab84687e59e4458d8e42c4d9b66.tar.gz sci-f73ae7dd317ffab84687e59e4458d8e42c4d9b66.tar.bz2 sci-f73ae7dd317ffab84687e59e4458d8e42c4d9b66.zip | |
sci-physics/thepeg: Properly link with c++
Package-Manager: portage-2.2.8-prefix
| -rw-r--r-- | sci-physics/thepeg/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-physics/thepeg/thepeg-1.9.1.ebuild | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog index 57d3fadb3..bca9a07c5 100644 --- a/sci-physics/thepeg/ChangeLog +++ b/sci-physics/thepeg/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> thepeg-1.9.1.ebuild: + sci-physics/thepeg: Properly link with c++ + *thepeg-1.9.1 (06 May 2014) 06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +thepeg-1.9.1.ebuild: diff --git a/sci-physics/thepeg/thepeg-1.9.1.ebuild b/sci-physics/thepeg/thepeg-1.9.1.ebuild index e70b39f1e..6ecdb8ab6 100644 --- a/sci-physics/thepeg/thepeg-1.9.1.ebuild +++ b/sci-physics/thepeg/thepeg-1.9.1.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2 ${TEST_URI}/MRST2001nlo.LHgrid ) )" LICENSE="GPL-2" -SLOT="0" +SLOT="0/18" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="emacs fastjet hepmc java lhapdf rivet static-libs test zlib" @@ -46,7 +46,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch ) src_prepare() { find -name 'Makefile.am' -exec \ sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die - sed -i -e '/dist_pkgdata_DATA = ThePEG.el/d' lib/Makefile.am || die + # trick to force c++ linking + sed -i \ + -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \ + -e '/dist_pkgdata_DATA = ThePEG.el/d' \ + lib/Makefile.am || die autotools-utils_src_prepare java-pkg-opt-2_src_prepare } |