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/files/, dev-util/ati-stream-sdk/
Date: Thu, 24 Feb 2011 15:58:36 +0000 (UTC) [thread overview]
Message-ID: <2b60f0aefbc363e97244a63377ef4c06bd1b8dba.c1pher@gentoo> (raw)
commit: 2b60f0aefbc363e97244a63377ef4c06bd1b8dba
Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:53:52 2011 +0000
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:53:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2b60f0ae
Correct installation path.
---
dev-util/ati-stream-sdk/Manifest | 4 ++--
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 13 +++++--------
dev-util/ati-stream-sdk/files/Makefile | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 7a983aa..8f587e1 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 2281 RMD160 610ca13cc6ef1274102baaacfc06671278b8a123 SHA1 9f7d59f04c4b92a8e4f2fdbea1ae71dd2d29bf3f SHA256 80c08f9ec8ad1bbb9e569bff547297baa9f25ae98b7b6641f886a1bf76012878
+AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
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.3-r1.ebuild 2326 RMD160 47620cba6c28417467a547d4932790582d4f0819 SHA1 a9261b2092a735b385554f327cd5291fd2268faf SHA256 6b241ce327b72f91d8776849ccf9a9269cd199b515f1bda4077c0b4160067e51
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688
MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
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
index c6b84d6..c7b3a8c 100644
--- 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
@@ -60,23 +60,20 @@ src_install() {
rm include/GL/{glext.h,glut.h} || die
if use amd64; then
- #emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
- emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
+ emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
if use multilib; then
- #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
- emake DESTDIR="${D}" ARCH="x86" \
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
install-lib install-etc || die "Install multilib failed"
fi
else
- #emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
- emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
fi
cat > "${T}/99${PN}" << EOF
PATH=${DEST}/bin
ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/lib
-LD_LIBRARY_PATH=${DEST}/lib
+LDPATH=${DEST}/$(get_libdir)
+LD_LIBRARY_PATH=${DEST}/$(get_libdir)
EOF
doenvd "${T}/99${PN}"
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 3fbacc6..95fc754 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,7 @@ install-lib:
test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
@list='$(LIBFILES)'; for f in $$list; do\
if test -f $$f; then\
- f1=`echo $$f | sed -e 's|lib/||g'`;\
+ f1=`echo $$f | sed -e 's|lib/||g' -e "s|x86[_0-9]*/||g"`;\
base=`basename $$f1`;\
dir=`echo $$f1 | sed -e "s|$$base||g"`;\
test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\
next reply other threads:[~2011-02-24 15:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 15:58 Dane Smith [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-24 19:50 [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/ Dane Smith
2011-02-24 19:46 Dane Smith
2011-02-24 19:24 Dane Smith
2011-02-24 19:12 Dane Smith
2011-02-24 16:43 Dane Smith
2011-02-24 15:48 Dane Smith
2011-02-24 15:27 Dane Smith
2011-02-24 15:15 Dane Smith
2011-02-24 15:09 Dane Smith
2011-02-24 15:03 Dane Smith
2011-02-23 18:46 Dane Smith
2011-02-23 18:21 Dane Smith
2011-02-23 18:05 Dane Smith
2011-02-23 17:52 Dane Smith
2011-02-23 16:34 Dane Smith
2011-02-23 16:02 Dane Smith
2011-02-23 15:58 Dane Smith
2011-02-23 14:54 Dane Smith
2011-02-23 14:48 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=2b60f0aefbc363e97244a63377ef4c06bd1b8dba.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