diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-02-16 10:01:51 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-02-16 10:01:51 +0000 |
| commit | a948df8f3e5889fabe64c4ee115604916c5fd9d2 (patch) | |
| tree | 20e20d7516da71e6578295c88d4f3b017afe2715 /dev-lang/mozart | |
| parent | stable on amd64; bug 167113 (diff) | |
| download | gentoo-2-a948df8f3e5889fabe64c4ee115604916c5fd9d2.tar.gz gentoo-2-a948df8f3e5889fabe64c4ee115604916c5fd9d2.tar.bz2 gentoo-2-a948df8f3e5889fabe64c4ee115604916c5fd9d2.zip | |
Respect platform emulator directory in src_install.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-lang/mozart')
| -rw-r--r-- | dev-lang/mozart/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mozart/files/mozart-1.3.2-emubin.patch | 36 | ||||
| -rw-r--r-- | dev-lang/mozart/mozart-1.3.2.ebuild | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog index 678b8fb0c142..d64e8050e352 100644 --- a/dev-lang/mozart/ChangeLog +++ b/dev-lang/mozart/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mozart # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.1 2007/02/14 08:30:49 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.2 2007/02/16 10:01:51 keri Exp $ + + 16 Feb 2007; keri <keri@gentoo.org> +files/mozart-1.3.2-emubin.patch, + mozart-1.3.2.ebuild: + Respect platform emulator directory in src_install. *mozart-1.3.2 (14 Feb 2007) diff --git a/dev-lang/mozart/files/mozart-1.3.2-emubin.patch b/dev-lang/mozart/files/mozart-1.3.2-emubin.patch new file mode 100644 index 000000000000..7a18e108c88b --- /dev/null +++ b/dev-lang/mozart/files/mozart-1.3.2-emubin.patch @@ -0,0 +1,36 @@ +diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.20060615/platform/emulator/Makefile.in +--- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in 2004-01-12 23:03:44.000000000 +1300 ++++ mozart-1.3.2.20060615/platform/emulator/Makefile.in 2007-02-16 22:50:14.000000000 +1300 +@@ -387,9 +387,9 @@ + + install:: install-bin install-inc install-cache + +-install-bin: $(TARGETS) $(BINDIR) ++install-bin: $(TARGETS) $(EMUBINDIR) + for exe in oztool.sh $(TARGETS); do\ +- $(INSTALL_BIN) $$exe $(BINDIR) || exit 1;\ ++ $(INSTALL_BIN) $$exe $(EMUBINDIR) || exit 1;\ + done + + NEWCACHEDIR = $(PREFIX)/cache/x-oz/boot +@@ -410,7 +410,7 @@ + if [ -r emulator.def ]; then $(INSTALL_FILE) emulator.def $(INCDIR); fi + if [ -r emulator.cmd ]; then $(INSTALL_FILE) emulator.cmd $(INCDIR); fi + +-$(BINDIR) $(INCDIR): ++$(EMUBINDIR) $(INCDIR): + $(INSTALL_DIR) $@ + + version.cc: version.sed $(filter-out version.cc,$(ALLSRCS)) +diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.vars.in mozart-1.3.2.20060615/platform/emulator/Makefile.vars.in +--- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.vars.in 2003-04-16 20:02:57.000000000 +1200 ++++ mozart-1.3.2.20060615/platform/emulator/Makefile.vars.in 2007-02-16 22:50:40.000000000 +1300 +@@ -29,7 +29,7 @@ + PREFIX= @prefix@ + PLATFORM= @platform@ + +-BINDIR= $(PREFIX)/platform/$(PLATFORM) ++EMUBINDIR= $(PREFIX)/platform/$(PLATFORM) + INCDIR= $(PREFIX)/include + + EMULATOR_EXE= @EMULATOR_EXE@ diff --git a/dev-lang/mozart/mozart-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild index 4162db63fc88..96cf24946375 100644 --- a/dev-lang/mozart/mozart-1.3.2.ebuild +++ b/dev-lang/mozart/mozart-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.1 2007/02/14 08:30:49 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.2 2007/02/16 10:01:51 keri Exp $ inherit eutils @@ -34,6 +34,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-portage.patch epatch "${FILESDIR}"/${P}-contrib.patch + epatch "${FILESDIR}"/${P}-emubin.patch epatch "${FILESDIR}"/${P}-gcc4.patch epatch "${FILESDIR}"/${P}-nostrip.patch epatch "${FILESDIR}"/${P}-ozplatform.patch |