diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mozart/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mozart/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch | 65 | ||||
| -rw-r--r-- | dev-lang/mozart/mozart-1.4.0.ebuild | 3 |
4 files changed, 75 insertions, 4 deletions
diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog index ea4f103f8ba9..efbd91b1abd1 100644 --- a/dev-lang/mozart/ChangeLog +++ b/dev-lang/mozart/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mozart # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.20 2008/08/23 21:28:10 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.21 2008/08/26 07:33:11 keri Exp $ + + 26 Aug 2008; <keri@gentoo.org> +files/mozart-1.4.0-dss-libpath.patch, + mozart-1.4.0.ebuild: + Ensure compiled libdss is used during src_test 23 Aug 2008; <keri@gentoo.org> +files/mozart-1.4.0-cstdio.patch, mozart-1.4.0.ebuild: diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest index 42346eb70840..50fa0eb77858 100644 --- a/dev-lang/mozart/Manifest +++ b/dev-lang/mozart/Manifest @@ -8,6 +8,7 @@ AUX mozart-1.3.2-portage.patch 11472 RMD160 3b58dce99cafc4f282f2a3a1faff39f25af0 AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b SHA1 6ccc5ea52f8cabde2d92a9e01977c37d1d6dd8a0 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211 AUX mozart-1.4.0-contrib.patch 10158 RMD160 c27d3537df58756706b2fe4dc53a1435eb03f8a6 SHA1 d4c01206336932dad16a6ec7a73da1b850347ca2 SHA256 6db14aa85d3f76439b8cddfc2cfc4e43df5750cf4d0a4c5637f2b89a5b6d82fb AUX mozart-1.4.0-cstdio.patch 318 RMD160 38a71ae337ae663b51f40ad4c30c11da4cbfd1f0 SHA1 7ef310929972fd8a580905bcb5fc5948037650aa SHA256 3e2396b75ca15a0276d473d358c532c4442c896221550b37a98af783389c3b33 +AUX mozart-1.4.0-dss-libpath.patch 1546 RMD160 92b250b7890c2f65c212ef87c9ac6fb9c9fb3605 SHA1 06e99d305d17b382f8806399656118c9e1101143 SHA256 78b8b1a1fe33eaaa2527c67fbf9bd33efbc3b7b8328ea73130315421d573d460 AUX mozart-1.4.0-dss-pic.patch 420 RMD160 9626e86cb378d3e3155fa1bbc9b536563c8e5b53 SHA1 97c7ef74e71b35b7f95c4393f7809f940568c3dc SHA256 ad6bb0d12a6e047c34c223ee9e02f25281d5ec98760738507d8c603cbee222f8 AUX mozart-1.4.0-dss-prefix.patch 1546 RMD160 e600b1c830dca05e466ad8d677fde4277ed3ef99 SHA1 993c214705c62183f7a04b3b383924d22d098b18 SHA256 9ccc1d8718edbd4dcf62f1e0c2b0117cc5ebc35d7abcf4f8992ba63521b489d6 AUX mozart-1.4.0-nostrip.patch 347 RMD160 4a74bcda2c731c9828f2643df82edf5b1b2ec681 SHA1 b31ea5c757bdb3fc20b840415be4bbdbcad4fac1 SHA256 bc57e2d5c8c64a15f10d9ecd64e98709bf32c5bca3ba74816a74c96799e6d256 @@ -20,6 +21,6 @@ DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 RMD160 1d0c9787ec1bbf28881060a2c36 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 RMD160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 SHA1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223 EBUILD mozart-1.3.2-r1.ebuild 3294 RMD160 13c75b669a0419f40d1d4bf4f1e3156e1703ea9a SHA1 f8762e36986786b895c2c4b85ef7895bc03c777b SHA256 74327ae3f54ee17df12a849505750dca7e4d0df1bedfdfece0cf0fd9e75faa85 EBUILD mozart-1.3.2.ebuild 2786 RMD160 8bfbd7d4d39c026f9b0148d3bc82122f04ddc98a SHA1 b6cb5273fed42eefa4ddb039be976b4e2088187e SHA256 40732240e2fe3d221f77101a582207ec472025b235b1bd19cb3bbe2f8081973b -EBUILD mozart-1.4.0.ebuild 3139 RMD160 c3553cbc409f3d6d6f7c37c25644c1444bc6ca03 SHA1 d27d762ae208e7a34140479de2370932087c1f05 SHA256 df3318ffc2803f2c2d6c3e89724ce9855f7695cc205e2ca8b488d5a9dcc7fed6 -MISC ChangeLog 3228 RMD160 8f1f8f3738d2b761d746f5a57e938a50b7760c95 SHA1 27510450f5ed38114f8ee2294453be4cfa8cb425 SHA256 8d6a85dd12aeec9e8f4a0bb61dbda959f87027f267bc8a75a977cc42636c10a5 +EBUILD mozart-1.4.0.ebuild 3184 RMD160 25cde16519e5c4f854ad3af5e68bc076002e116b SHA1 778a0fed4dbe8789061a39a84e1d62348f22aba3 SHA256 fd93040180f886aa26a73db1834670e992bf709416ed44f8f7f0f27f9f48c2e8 +MISC ChangeLog 3373 RMD160 fb6cd1b16f09631131425e7d0457095e7a7322d8 SHA1 ea777230f3382f2c2ee73d03c61244306c74c724 SHA256 bf3125f1a7d706093cf1c7632e2f0825f8e05ca8abd44dd6920315c4b38dc8ea MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa diff --git a/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch b/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch new file mode 100644 index 000000000000..d8f5eab79e80 --- /dev/null +++ b/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch @@ -0,0 +1,65 @@ +diff -ur mozart-1.4.0.20080704.orig/share/Makefile.boot.in mozart-1.4.0.20080704/share/Makefile.boot.in +--- mozart-1.4.0.20080704.orig/share/Makefile.boot.in 2004-02-18 20:04:24.000000000 +0000 ++++ mozart-1.4.0.20080704/share/Makefile.boot.in 2008-08-26 03:01:04.000000000 +0000 +@@ -38,6 +38,7 @@ + + EXE_EXT=@EXE_EXT@ + ++BOOTDSS=$(BUILDTOP)/platform/dss + BOOTEMU=$(BUILDTOP)/platform/emulator/@EMULATOR_EXE@ + BOOTENG=$(BUILDTOP)/share/ozengine.sh + BOOTCOM=$(BOOTENG) $(BUILDTOP)/share/lib/ozc$(EXE_EXT) +@@ -111,8 +112,15 @@ + endif + endif + ++ifdef @LD_VAR@ ++LD_VAR=$(BOOTDSS):$(@LD_VAR@) ++else ++LD_VAR=$(BOOTDSS) ++endif ++ + boot-%: + $(MAKE) $* \ ++ @LD_VAR@=$(LD_VAR) \ + OZEMULATOR=$(BOOTEMU) \ + OZENGINE=$(BOOTENG) \ + OZC="$(BOOTCOM)" \ +diff -ur mozart-1.4.0.20080704.orig/share/configure mozart-1.4.0.20080704/share/configure +--- mozart-1.4.0.20080704.orig/share/configure 2004-04-01 10:48:04.000000000 +0000 ++++ mozart-1.4.0.20080704/share/configure 2008-08-26 03:00:42.000000000 +0000 +@@ -1408,12 +1408,20 @@ + ;; + esac + +- +- +- +- +- +- ++case $platform in ++win32*) ++ LD_VAR=PATH ++ ;; ++darwin*) ++ LD_VAR=DYLD_LIBRARY_PATH ++ ;; ++aix*) ++ LD_VAR=LIBPATH ++ ;; ++*) ++ LD_VAR=LD_LIBRARY_PATH ++ ;; ++esac + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 + echo "configure:1420: checking whether ln -s works" >&5 +@@ -3896,6 +3904,7 @@ + s%@WINOZTOOLCXXFLAGS@%$WINOZTOOLCXXFLAGS%g + s%@WINOZTOOLLDFLAGS@%$WINOZTOOLLDFLAGS%g + s%@EXE_EXT@%$EXE_EXT%g ++s%@LD_VAR@%$LD_VAR%g + s%@LN_S@%$LN_S%g + s%@M4@%$M4%g + s%@PERL@%$PERL%g diff --git a/dev-lang/mozart/mozart-1.4.0.ebuild b/dev-lang/mozart/mozart-1.4.0.ebuild index df5d2760c766..189190f4374f 100644 --- a/dev-lang/mozart/mozart-1.4.0.ebuild +++ b/dev-lang/mozart/mozart-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.2 2008/08/23 21:28:10 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.3 2008/08/26 07:33:11 keri Exp $ inherit elisp-common eutils @@ -43,6 +43,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-contrib.patch epatch "${FILESDIR}"/${P}-dss-prefix.patch epatch "${FILESDIR}"/${P}-dss-pic.patch + epatch "${FILESDIR}"/${P}-dss-libpath.patch epatch "${FILESDIR}"/${P}-nostrip.patch } |