Gentoo Archives: gentoo-commits

From: Dane Smith <c1pher@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/
Date: Thu, 24 Feb 2011 15:50:32
Message-Id: 23bc2105bddff38486ab5eb28e83fd1fe9f78016.c1pher@gentoo
1 commit: 23bc2105bddff38486ab5eb28e83fd1fe9f78016
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 24 15:45:40 2011 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 24 15:45:40 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=23bc2105
7
8 Fix ebuild to rearrange libraries.
9
10 ---
11 dev-util/ati-stream-sdk/Manifest | 2 +-
12 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 13 ++++++++-----
13 2 files changed, 9 insertions(+), 6 deletions(-)
14
15 diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
16 index 776eecb..7a983aa 100644
17 --- a/dev-util/ati-stream-sdk/Manifest
18 +++ b/dev-util/ati-stream-sdk/Manifest
19 @@ -1,5 +1,5 @@
20 AUX Makefile 2281 RMD160 610ca13cc6ef1274102baaacfc06671278b8a123 SHA1 9f7d59f04c4b92a8e4f2fdbea1ae71dd2d29bf3f SHA256 80c08f9ec8ad1bbb9e569bff547297baa9f25ae98b7b6641f886a1bf76012878
21 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
22 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
23 -EBUILD ati-stream-sdk-2.3-r1.ebuild 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688
24 +EBUILD ati-stream-sdk-2.3-r1.ebuild 2326 RMD160 47620cba6c28417467a547d4932790582d4f0819 SHA1 a9261b2092a735b385554f327cd5291fd2268faf SHA256 6b241ce327b72f91d8776849ccf9a9269cd199b515f1bda4077c0b4160067e51
25 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
26
27 diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
28 index c7b3a8c..c6b84d6 100644
29 --- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
30 +++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
31 @@ -60,20 +60,23 @@ src_install() {
32 rm include/GL/{glext.h,glut.h} || die
33
34 if use amd64; then
35 - emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
36 + #emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
37 + emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
38 if use multilib; then
39 - emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
40 + #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
41 + emake DESTDIR="${D}" ARCH="x86" \
42 install-lib install-etc || die "Install multilib failed"
43 fi
44 else
45 - emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
46 + #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
47 + emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
48 fi
49
50 cat > "${T}/99${PN}" << EOF
51 PATH=${DEST}/bin
52 ROOTPATH=${DEST}/bin
53 -LDPATH=${DEST}/$(get_libdir)
54 -LD_LIBRARY_PATH=${DEST}/$(get_libdir)
55 +LDPATH=${DEST}/lib
56 +LD_LIBRARY_PATH=${DEST}/lib
57 EOF
58 doenvd "${T}/99${PN}"