| 1 |
commit: 2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36 |
| 2 |
Author: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 23 18:16:29 2011 +0000 |
| 4 |
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 23 18:16:29 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2d5c8e8d |
| 7 |
|
| 8 |
Multilib+ |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/ati-stream-sdk/Manifest | 4 +- |
| 12 |
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 8 ++++- |
| 13 |
dev-util/ati-stream-sdk/files/Makefile | 32 ++++++++++---------- |
| 14 |
3 files changed, 24 insertions(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest |
| 17 |
index 735dde4..f39b6a1 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 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d |
| 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 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa |
| 26 |
+EBUILD ati-stream-sdk-2.3-r1.ebuild 1991 RMD160 b4d164ea0df067c366e334c3d2259dea9cb589b2 SHA1 a20ba92ac7d2fbe271c59ea2f8381cdfc9eabfc0 SHA256 d26ae0d006297e2819c5b6a8806d9797d381098a6036a3b329f9b6e333f48738 |
| 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 4a993c0..d8ca9c6 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 |
@@ -54,9 +54,13 @@ src_install() { |
| 34 |
rm include/GL/{glext.h,glut.h} || die |
| 35 |
|
| 36 |
if use amd64; then |
| 37 |
- emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed"; |
| 38 |
+ emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 39 |
+ if use multilib; then |
| 40 |
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \ |
| 41 |
+ install-lib || die "Install multilib failed" |
| 42 |
+ fi |
| 43 |
else |
| 44 |
- emake DESTDIR="${D}" ARCH="x86" install || die "Install failed"; |
| 45 |
+ emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed"; |
| 46 |
fi |
| 47 |
|
| 48 |
cat > "${T}/99${PN}" << EOF |
| 49 |
|
| 50 |
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile |
| 51 |
index 9828850..d5bbb83 100644 |
| 52 |
--- a/dev-util/ati-stream-sdk/files/Makefile |
| 53 |
+++ b/dev-util/ati-stream-sdk/files/Makefile |
| 54 |
@@ -1,9 +1,9 @@ |
| 55 |
DESTDIR= |
| 56 |
-PREFIX=$(DESTDIR)/opt/ati-stream-sdk/ |
| 57 |
-LIBDIR=$(PREFIX)lib/ |
| 58 |
-BINDIR=$(PREFIX)bin/ |
| 59 |
-INCDIR=$(PREFIX)include/ |
| 60 |
-ETCDIR=$(DESTDIR)etc/ |
| 61 |
+PREFIX=$(DESTDIR)/opt/ati-stream-sdk |
| 62 |
+LIBDIR=$(PREFIX)/lib |
| 63 |
+BINDIR=$(PREFIX)/bin |
| 64 |
+INCDIR=$(PREFIX)/include |
| 65 |
+ETCDIR=$(DESTDIR)/etc |
| 66 |
|
| 67 |
INSTALLBIN=install |
| 68 |
INSTALLDAT=install -m0644 |
| 69 |
@@ -32,9 +32,9 @@ install-etc: |
| 70 |
f1=`echo $$f | sed -e 's|etc/||g'`;\ |
| 71 |
base=`basename $$f1`;\ |
| 72 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
| 73 |
- test -z "$(ETCDIR)$$dir" || $(MKDIR) "$(ETCDIR)$$dir";\ |
| 74 |
- echo "$(INSTALLDAT) $$f $(ETCDIR)$$f1";\ |
| 75 |
- $(INSTALLDAT) "$$f" $(ETCDIR)$$f1 || exit 1;\ |
| 76 |
+ test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\ |
| 77 |
+ echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\ |
| 78 |
+ $(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\ |
| 79 |
else :; fi;\ |
| 80 |
done |
| 81 |
|
| 82 |
@@ -43,8 +43,8 @@ install-bin: |
| 83 |
@list='$(BINFILES)'; for f in $$list; do\ |
| 84 |
if test -f $$f; then\ |
| 85 |
f1=`basename $$f`;\ |
| 86 |
- echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\ |
| 87 |
- $(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\ |
| 88 |
+ echo "$(INSTALLBIN) $$f $(BINDIR)/$$f1";\ |
| 89 |
+ $(INSTALLBIN) "$$f" "$(BINDIR)/$$f1" || exit 1;\ |
| 90 |
else :; fi;\ |
| 91 |
done |
| 92 |
|
| 93 |
@@ -55,9 +55,9 @@ install-lib: |
| 94 |
f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\ |
| 95 |
base=`basename $$f1`;\ |
| 96 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
| 97 |
- test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\ |
| 98 |
- echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\ |
| 99 |
- $(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\ |
| 100 |
+ test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\ |
| 101 |
+ echo "$(INSTALLBIN) $$f $(LIBDIR)/$$f1";\ |
| 102 |
+ $(INSTALLBIN) "$$f" "$(LIBDIR)/$$f1" || exit 1;\ |
| 103 |
else :; fi;\ |
| 104 |
done |
| 105 |
|
| 106 |
@@ -68,9 +68,9 @@ install-include: |
| 107 |
f1=`echo $$f | sed -e 's|include||g'`;\ |
| 108 |
base=`basename $$f1`;\ |
| 109 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
| 110 |
- test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\ |
| 111 |
- echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\ |
| 112 |
- $(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\ |
| 113 |
+ test -z "$(INCDIR)/$$dir" || $(MKDIR) "$(INCDIR)/$$dir";\ |
| 114 |
+ echo "$(INSTALLDAT) $$f $(INCDIR)/$$f1";\ |
| 115 |
+ $(INSTALLDAT) $$f $(INCDIR)/$$f1 || exit 1;\ |
| 116 |
else :; fi;\ |
| 117 |
done |
Archives