diff options
| author |   Dane Smith <c1pher@gentoo.org> | 2011-02-24 10:22:57 -0500 |
|---|---|---|
| committer | Dane Smith <c1pher@gentoo.org> | 2011-02-24 10:22:57 -0500 |
| commit | f5bfd1114aae0ad278cd19b2a9588c911cb20f13 (patch) | |
| tree | 5a46ee1270ff8e94aff7b1e60f44e21b3f5e3f2a | |
| parent | And again (diff) | |
| download | c1pher-f5bfd1114aae0ad278cd19b2a9588c911cb20f13.tar.gz c1pher-f5bfd1114aae0ad278cd19b2a9588c911cb20f13.tar.bz2 c1pher-f5bfd1114aae0ad278cd19b2a9588c911cb20f13.zip | |
Multilib attempt 2
| -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 | 17 | ||||
| -rw-r--r-- | dev-util/ati-stream-sdk/files/Makefile | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest index fa28365..82631c4 100644 --- a/dev-util/ati-stream-sdk/Manifest +++ b/dev-util/ati-stream-sdk/Manifest @@ -1,5 +1,5 @@ -AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd +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 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa +EBUILD ati-stream-sdk-2.3-r1.ebuild 2235 RMD160 01df1a86a81e46ba20bb019cbabca48c00d7b5d1 SHA1 d77d458b1262d2aaf2eaeff7fc65520223248dcd SHA256 fc2d53b532334926195e1dff993015623321b7b3d18ebddfbc676cb66404318a 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..44ad312 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 @@ -41,8 +41,15 @@ src_unpack() { src_prepare(){ if use examples; then - sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk\ + sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk \ || die "Sed failed" + sed -i \ + -e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \ + -e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \ +# -e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \ + make/openclsdkdefs.mk || die "Sed failed" + + fi } @@ -54,9 +61,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 install-etc || 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 d5bbb83..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' -e 's|x86*/||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";\ |