diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-23 16:00:17 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-23 16:00:17 +0000 |
| commit | f0bc590789b02a3c8d0adabe8f31f2965500f246 (patch) | |
| tree | 6eefe87e2b8e6eeca28a0a568c8b0893eb7ae71a /sci-misc | |
| parent | Update build system not to die by default. Per bug #266597. (diff) | |
| download | gentoo-2-f0bc590789b02a3c8d0adabe8f31f2965500f246.tar.gz gentoo-2-f0bc590789b02a3c8d0adabe8f31f2965500f246.tar.bz2 gentoo-2-f0bc590789b02a3c8d0adabe8f31f2965500f246.zip | |
Fix multilib support for cuda. Per bug #266637.
(Portage version: 2.2_rc30/cvs/Linux x86_64)
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/boinc/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-misc/boinc/boinc-6.4.5-r1.ebuild | 15 | ||||
| -rw-r--r-- | sci-misc/boinc/files/boinc.init | 4 |
3 files changed, 18 insertions, 7 deletions
diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog index 67b576b81995..2c545e729c85 100644 --- a/sci-misc/boinc/ChangeLog +++ b/sci-misc/boinc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-misc/boinc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.58 2009/03/30 14:00:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.59 2009/04/23 16:00:16 scarabeus Exp $ + + 23 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> files/boinc.init, + boinc-6.4.5-r1.ebuild: + Fix multilib support for cuda. Per bug #266637. 30 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> boinc-6.4.5-r1.ebuild: Add block on quickswitch since their files collide. Per bug #210877. diff --git a/sci-misc/boinc/boinc-6.4.5-r1.ebuild b/sci-misc/boinc/boinc-6.4.5-r1.ebuild index b0629d764fd0..ffdb8d2968a9 100644 --- a/sci-misc/boinc/boinc-6.4.5-r1.ebuild +++ b/sci-misc/boinc/boinc-6.4.5-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-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.4 2009/03/30 14:00:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.5 2009/04/23 16:00:16 scarabeus Exp $ # # Don't forget to keep things in sync with binary boinc package! @@ -8,7 +8,7 @@ EAPI="2" -inherit flag-o-matic depend.apache eutils wxwidgets +inherit flag-o-matic depend.apache eutils wxwidgets multilib DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="http://boinc.ssl.berkeley.edu/" @@ -102,7 +102,7 @@ src_configure() { } src_compile() { - # disable paralel build. + # disable parallel build. emake -j1 || die "emake failed" } @@ -121,12 +121,19 @@ src_install() { rm "${D}"/usr/bin/ca-bundle.crt rm -rf "${D}"/etc/ - newinitd "${FILESDIR}"/${PN}.init ${PN} + # initd script needs to be multilib aware + cp "${FILESDIR}"/${PN}.init "${T}" + sed -i \ + -e "s:%LIBDIR%:$(get_libdir):g" \ + "${T}"/${PN}.init || die "sed for multilib in init script failed" + newinitd "${T}"/${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} } pkg_setup() { enewgroup ${PN} + # note this works only for first install so we have to + # elog user about the need of being in video group if use cuda; then enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video" else diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init index 5897b50c8c40..3735c4bd12f1 100644 --- a/sci-misc/boinc/files/boinc.init +++ b/sci-misc/boinc/files/boinc.init @@ -30,9 +30,9 @@ generate_logs() { } cuda_check() { - if [[ -f /opt/cuda/lib/libcudart.so ]]; then + if [[ -f /opt/cuda/%LIBDIR%/libcudart.so ]]; then # symlink wont harm :] - ln -snf /opt/cuda/lib/libcudart.so $RUNTIMEDIR/libcudart.so + ln -snf /opt/cuda/%LIBDIR%/libcudart.so $RUNTIMEDIR/libcudart.so fi } |