diff options
| -rw-r--r-- | dev-lang/mozart/ChangeLog | 6 | ||||
| -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 |
3 files changed, 72 insertions, 2 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/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 } |