| 1 |
commit: f55e8479da068fdff01f5bbe06c3ca34c4ba882f |
| 2 |
Author: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 24 16:38:52 2011 +0000 |
| 4 |
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 24 16:38:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=f55e8479 |
| 7 |
|
| 8 |
back to no multilib |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/ati-stream-sdk/Manifest | 4 ++-- |
| 12 |
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 16 +++------------- |
| 13 |
dev-util/ati-stream-sdk/files/Makefile | 2 +- |
| 14 |
3 files changed, 6 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest |
| 17 |
index 8f587e1..fa28365 100644 |
| 18 |
--- a/dev-util/ati-stream-sdk/Manifest |
| 19 |
+++ b/dev-util/ati-stream-sdk/Manifest |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
-AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857 |
| 22 |
+AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd |
| 23 |
DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6 |
| 24 |
DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad |
| 25 |
-EBUILD ati-stream-sdk-2.3-r1.ebuild 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688 |
| 26 |
+EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa |
| 27 |
MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7 |
| 28 |
|
| 29 |
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 |
| 30 |
index c7b3a8c..4a993c0 100644 |
| 31 |
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
| 32 |
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
| 33 |
@@ -41,14 +41,8 @@ src_unpack() { |
| 34 |
|
| 35 |
src_prepare(){ |
| 36 |
if use examples; then |
| 37 |
- sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk \ |
| 38 |
+ sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk\ |
| 39 |
|| die "Sed failed" |
| 40 |
- sed -i \ |
| 41 |
- -e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \ |
| 42 |
- -e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \ |
| 43 |
- make/openclsdkdefs.mk || die "Sed failed" |
| 44 |
- |
| 45 |
- |
| 46 |
fi |
| 47 |
} |
| 48 |
|
| 49 |
@@ -60,13 +54,9 @@ src_install() { |
| 50 |
rm include/GL/{glext.h,glut.h} || die |
| 51 |
|
| 52 |
if use amd64; then |
| 53 |
- emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 54 |
- if use multilib; then |
| 55 |
- emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \ |
| 56 |
- install-lib install-etc || die "Install multilib failed" |
| 57 |
- fi |
| 58 |
+ emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed"; |
| 59 |
else |
| 60 |
- emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 61 |
+ emake DESTDIR="${D}" ARCH="x86" install || die "Install failed"; |
| 62 |
fi |
| 63 |
|
| 64 |
cat > "${T}/99${PN}" << EOF |
| 65 |
|
| 66 |
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile |
| 67 |
index 95fc754..d5bbb83 100644 |
| 68 |
--- a/dev-util/ati-stream-sdk/files/Makefile |
| 69 |
+++ b/dev-util/ati-stream-sdk/files/Makefile |
| 70 |
@@ -52,7 +52,7 @@ install-lib: |
| 71 |
test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)" |
| 72 |
@list='$(LIBFILES)'; for f in $$list; do\ |
| 73 |
if test -f $$f; then\ |
| 74 |
- f1=`echo $$f | sed -e 's|lib/||g' -e "s|x86[_0-9]*/||g"`;\ |
| 75 |
+ f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\ |
| 76 |
base=`basename $$f1`;\ |
| 77 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
| 78 |
test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\ |
Archives