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 14:52:14
Message-Id: bd525c9743f78f965dac0258e2ea4549fb9c6f43.c1pher@gentoo
1 commit: bd525c9743f78f965dac0258e2ea4549fb9c6f43
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 24 14:47:20 2011 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 24 14:47:20 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=bd525c97
7
8 Remove multilib.. for real this time.
9
10 ---
11 dev-util/ati-stream-sdk/Manifest | 2 +-
12 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 23 +++++++++----------
13 2 files changed, 12 insertions(+), 13 deletions(-)
14
15 diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
16 index 0729ab3..d9ad4cc 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 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
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 2187 RMD160 073a7ef915ada7507e1feade4ffecf6ac263442a SHA1 d8f0768e6106cc2fd16583b2acd6bab2b12775db SHA256 cf45f87abe5df707d074927f4fb94639900ca66c43dd2303b8ebb8737bb06c86
24 +EBUILD ati-stream-sdk-2.3-r1.ebuild 2264 RMD160 c800d9b220a61e3aa764e3227a71ec4549947a66 SHA1 6db819c535ae2e6f706fa57b8853908d8819faef SHA256 3c503ed93b71e50d681251777669849acfbfd200d0e7d9670006edcd41aabd70
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 5ae86fd..c322054 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 @@ -43,13 +43,11 @@ src_prepare(){
32 if use examples; then
33 sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk \
34 || die "Sed failed"
35 - sed -i \
36 - -e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
37 - -e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
38 - -e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
39 - make/openclsdkdefs.mk || die "Sed failed"
40 -
41 -
42 +# sed -i \
43 +# -e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
44 +# -e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
45 +# -e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
46 +# make/openclsdkdefs.mk || die "Sed failed"
47 fi
48 }
49
50 @@ -61,11 +59,12 @@ src_install() {
51 rm include/GL/{glext.h,glut.h} || die
52
53 if use amd64; then
54 - emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
55 - if use multilib; then
56 - emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
57 - install-lib || die "Install multilib failed"
58 - fi
59 +# emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
60 + emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
61 +# if use multilib; then
62 +# emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
63 +# install-lib || die "Install multilib failed"
64 +# fi
65 else
66 emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
67 fi