public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dane Smith" <c1pher@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/
Date: Thu, 24 Feb 2011 19:40:58 +0000 (UTC)	[thread overview]
Message-ID: <5b2504aac91614f2035f8422becd1c24707b8a1a.c1pher@gentoo> (raw)

commit:     5b2504aac91614f2035f8422becd1c24707b8a1a
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:30:05 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:30:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=5b2504aa

Fix binary location issues that are only present in 2.1

---
 dev-util/ati-stream-sdk/Manifest                  |    2 +-
 dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 36900fa..cf9373b 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -5,6 +5,6 @@ DIST ati-stream-sdk-v2.1-lnx32.tgz 51590733 RMD160 fa3bf3cc628e1db2e38133ae9d6b8
 DIST ati-stream-sdk-v2.1-lnx64.tgz 82901409 RMD160 778f0d46e96f77b345a963b1720fce43c0eb96ef SHA1 dbf468d73b19462cf359a0b7248c20cc3bf4ae93 SHA256 46f6e47172a412d5ee3b3aea60fc869ebd26fbccf7fadc9ec5e4146c38f4a7ff
 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
-EBUILD ati-stream-sdk-2.1.ebuild 2576 RMD160 df51af30f626a22aef29f19fdd4ef6e5bd2e19fe SHA1 4e8aa5b13c7cc3cca9490adcf32ffbae937d6ebd SHA256 c9c6d45aa277da4c66206b8326a657ca5f9f1ce1164c4548c4336e84ec52ee08
+EBUILD ati-stream-sdk-2.1.ebuild 2682 RMD160 1fcd5246734cbe1bc4491edce3eedc69f642f1ac SHA1 fc1352e719e3c27f77850e2e814a39186f6cd50b SHA256 19f8207346ffe4b75d6d647d27f4980506314f267ac67869c393810b659008bb
 EBUILD ati-stream-sdk-2.3-r1.ebuild 2481 RMD160 65d85bb24c69626330d61dbdc2d76d59a80824d5 SHA1 a0480685805eeba1702bb0fa3d6e4f7c9b791c90 SHA256 6e929ddee6519e47ca186b266245a8b99d194350bdfef499f1b3ab9be17234f1
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7

diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
index f044ec9..4a1ded9 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
@@ -54,12 +54,12 @@ src_compile(){ true; }
 
 src_install(){
 	local DEST=/opt/${PN}
-	local LIBDIR=
+	local SUBDIR=
 
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		LIBDIR=x86_64
+		SUBDIR=x86_64
 		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
 		if use multilib; then
 			emake DESTDIR="${D}" ARCH="x86" install-lib \
@@ -68,7 +68,7 @@ src_install(){
 		insinto /etc/OpenCL/vendors
 		doins "${FILESDIR}"/atiocl64.icd || die
 	else
-		LIBDIR=x86
+		SUBDIR=x86
 		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
 		insinto /etc/OpenCL/vendors
 		doins "${FILESDIR}"/atiocl32.icd || die
@@ -77,9 +77,11 @@ src_install(){
 	cat > "${T}/99${PN}" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/lib/${LIBDIR}
+LDPATH=${DEST}/lib/${SUBDIR}
 EOF
 	doenvd "${T}/99${PN}" || die
+	#Fix binary location issues that are only present in 2.1
+	dosym ${DEST}/bin ${DEST}/bin/${SUBDIR} || die
 
 	if use examples; then
 		insinto ${DEST}/examples



             reply	other threads:[~2011-02-24 19:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24 19:40 Dane Smith [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-02-24 19:40 [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/ Dane Smith
2011-02-24 19:29 Dane Smith
2011-02-24 19:28 Dane Smith
2011-02-24 19:12 Dane Smith
2011-02-24 15:50 Dane Smith
2011-02-24 15:32 Dane Smith
2011-02-24 15:30 Dane Smith
2011-02-24 15:00 Dane Smith
2011-02-24 14:52 Dane Smith
2011-02-24 14:44 Dane Smith
2011-02-24 14:39 Dane Smith
2011-02-24 13:34 Dane Smith
2011-02-23 19:33 Dane Smith
2011-02-23 19:28 Dane Smith
2011-02-23 19:10 Dane Smith
2011-02-23 18:50 Dane Smith
2011-02-23 16:38 Dane Smith
2011-02-23 15:59 Dane Smith
2011-02-23 15:33 Dane Smith
2011-02-23 15:31 Dane Smith
2011-02-23 15:30 Dane Smith
2011-02-23 15:29 Dane Smith
2011-02-10 21:02 Dane Smith

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5b2504aac91614f2035f8422becd1c24707b8a1a.c1pher@gentoo \
    --to=c1pher@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox