diff options
| author |   Dane Smith <c1pher@gentoo.org> | 2011-02-23 13:16:29 -0500 |
|---|---|---|
| committer | Dane Smith <c1pher@gentoo.org> | 2011-02-23 13:16:29 -0500 |
| commit | 2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36 (patch) | |
| tree | 89d07fb82ffed8ba93932cf8a93eb43542eab98a | |
| parent | Updated version. Cleaned makefile. (diff) | |
| download | c1pher-2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36.tar.gz c1pher-2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36.tar.bz2 c1pher-2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36.zip | |
Multilib+
| -rw-r--r-- | dev-util/ati-stream-sdk/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 8 | ||||
| -rw-r--r-- | dev-util/ati-stream-sdk/files/Makefile | 32 |
3 files changed, 24 insertions, 20 deletions
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest index 735dde4..f39b6a1 100644 --- a/dev-util/ati-stream-sdk/Manifest +++ b/dev-util/ati-stream-sdk/Manifest @@ -1,5 +1,5 @@ -AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d +AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd 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 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa +EBUILD ati-stream-sdk-2.3-r1.ebuild 1991 RMD160 b4d164ea0df067c366e334c3d2259dea9cb589b2 SHA1 a20ba92ac7d2fbe271c59ea2f8381cdfc9eabfc0 SHA256 d26ae0d006297e2819c5b6a8806d9797d381098a6036a3b329f9b6e333f48738 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 4a993c0..d8ca9c6 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 @@ -54,9 +54,13 @@ src_install() { rm include/GL/{glext.h,glut.h} || die if use amd64; then - 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' \ + install-lib || die "Install multilib failed" + fi else - 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 diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile index 9828850..d5bbb83 100644 --- a/dev-util/ati-stream-sdk/files/Makefile +++ b/dev-util/ati-stream-sdk/files/Makefile @@ -1,9 +1,9 @@ DESTDIR= -PREFIX=$(DESTDIR)/opt/ati-stream-sdk/ -LIBDIR=$(PREFIX)lib/ -BINDIR=$(PREFIX)bin/ -INCDIR=$(PREFIX)include/ -ETCDIR=$(DESTDIR)etc/ +PREFIX=$(DESTDIR)/opt/ati-stream-sdk +LIBDIR=$(PREFIX)/lib +BINDIR=$(PREFIX)/bin +INCDIR=$(PREFIX)/include +ETCDIR=$(DESTDIR)/etc INSTALLBIN=install INSTALLDAT=install -m0644 @@ -32,9 +32,9 @@ install-etc: f1=`echo $$f | sed -e 's|etc/||g'`;\ base=`basename $$f1`;\ dir=`echo $$f1 | sed -e "s|$$base||g"`;\ - test -z "$(ETCDIR)$$dir" || $(MKDIR) "$(ETCDIR)$$dir";\ - echo "$(INSTALLDAT) $$f $(ETCDIR)$$f1";\ - $(INSTALLDAT) "$$f" $(ETCDIR)$$f1 || exit 1;\ + test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\ + echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\ + $(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\ else :; fi;\ done @@ -43,8 +43,8 @@ install-bin: @list='$(BINFILES)'; for f in $$list; do\ if test -f $$f; then\ f1=`basename $$f`;\ - echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\ - $(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\ + echo "$(INSTALLBIN) $$f $(BINDIR)/$$f1";\ + $(INSTALLBIN) "$$f" "$(BINDIR)/$$f1" || exit 1;\ else :; fi;\ done @@ -55,9 +55,9 @@ install-lib: f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\ base=`basename $$f1`;\ dir=`echo $$f1 | sed -e "s|$$base||g"`;\ - test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\ - echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\ - $(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\ + test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\ + echo "$(INSTALLBIN) $$f $(LIBDIR)/$$f1";\ + $(INSTALLBIN) "$$f" "$(LIBDIR)/$$f1" || exit 1;\ else :; fi;\ done @@ -68,9 +68,9 @@ install-include: f1=`echo $$f | sed -e 's|include||g'`;\ base=`basename $$f1`;\ dir=`echo $$f1 | sed -e "s|$$base||g"`;\ - test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\ - echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\ - $(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\ + test -z "$(INCDIR)/$$dir" || $(MKDIR) "$(INCDIR)/$$dir";\ + echo "$(INSTALLDAT) $$f $(INCDIR)/$$f1";\ + $(INSTALLDAT) $$f $(INCDIR)/$$f1 || exit 1;\ else :; fi;\ done |