| 1 |
commit: 2b60f0aefbc363e97244a63377ef4c06bd1b8dba |
| 2 |
Author: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 24 15:53:52 2011 +0000 |
| 4 |
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 24 15:53:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2b60f0ae |
| 7 |
|
| 8 |
Correct installation path. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/ati-stream-sdk/Manifest | 4 ++-- |
| 12 |
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 13 +++++-------- |
| 13 |
dev-util/ati-stream-sdk/files/Makefile | 2 +- |
| 14 |
3 files changed, 8 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest |
| 17 |
index 7a983aa..8f587e1 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 2281 RMD160 610ca13cc6ef1274102baaacfc06671278b8a123 SHA1 9f7d59f04c4b92a8e4f2fdbea1ae71dd2d29bf3f SHA256 80c08f9ec8ad1bbb9e569bff547297baa9f25ae98b7b6641f886a1bf76012878 |
| 22 |
+AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857 |
| 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 2326 RMD160 47620cba6c28417467a547d4932790582d4f0819 SHA1 a9261b2092a735b385554f327cd5291fd2268faf SHA256 6b241ce327b72f91d8776849ccf9a9269cd199b515f1bda4077c0b4160067e51 |
| 26 |
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688 |
| 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 c6b84d6..c7b3a8c 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 |
@@ -60,23 +60,20 @@ src_install() { |
| 34 |
rm include/GL/{glext.h,glut.h} || die |
| 35 |
|
| 36 |
if use amd64; then |
| 37 |
- #emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 38 |
- emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed"; |
| 39 |
+ emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 40 |
if use multilib; then |
| 41 |
- #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \ |
| 42 |
- emake DESTDIR="${D}" ARCH="x86" \ |
| 43 |
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \ |
| 44 |
install-lib install-etc || die "Install multilib failed" |
| 45 |
fi |
| 46 |
else |
| 47 |
- #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 48 |
- emake DESTDIR="${D}" ARCH="x86" install || die "Install failed"; |
| 49 |
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 50 |
fi |
| 51 |
|
| 52 |
cat > "${T}/99${PN}" << EOF |
| 53 |
PATH=${DEST}/bin |
| 54 |
ROOTPATH=${DEST}/bin |
| 55 |
-LDPATH=${DEST}/lib |
| 56 |
-LD_LIBRARY_PATH=${DEST}/lib |
| 57 |
+LDPATH=${DEST}/$(get_libdir) |
| 58 |
+LD_LIBRARY_PATH=${DEST}/$(get_libdir) |
| 59 |
EOF |
| 60 |
doenvd "${T}/99${PN}" |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile |
| 64 |
index 3fbacc6..95fc754 100644 |
| 65 |
--- a/dev-util/ati-stream-sdk/files/Makefile |
| 66 |
+++ b/dev-util/ati-stream-sdk/files/Makefile |
| 67 |
@@ -52,7 +52,7 @@ install-lib: |
| 68 |
test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)" |
| 69 |
@list='$(LIBFILES)'; for f in $$list; do\ |
| 70 |
if test -f $$f; then\ |
| 71 |
- f1=`echo $$f | sed -e 's|lib/||g'`;\ |
| 72 |
+ f1=`echo $$f | sed -e 's|lib/||g' -e "s|x86[_0-9]*/||g"`;\ |
| 73 |
base=`basename $$f1`;\ |
| 74 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
| 75 |
test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\ |
Archives