| 1 |
keri 08/02/23 00:09:25 |
| 2 |
|
| 3 |
Added: mozart-stdlib-1.3.2-r1-ozmake.patch |
| 4 |
Log: |
| 5 |
Install binaries into Mozart bin dir. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mozart-stdlib-1.3.2-r1-ozmake.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur mozart-1.3.2.20060615-std.orig/Makefile.in mozart-1.3.2.20060615-std/Makefile.in |
| 17 |
--- mozart-1.3.2.20060615-std.orig/Makefile.in 2004-05-19 02:22:05.000000000 +1200 |
| 18 |
+++ mozart-1.3.2.20060615-std/Makefile.in 2007-02-17 11:12:09.000000000 +1300 |
| 19 |
@@ -12,6 +12,7 @@ |
| 20 |
NOTDIRSRCDIR = $(notdir $(SRCDIR)) |
| 21 |
BUILDDATE = $(shell date '+%Y%m%d') |
| 22 |
VERSION = $(shell $(OZTOOL) version) |
| 23 |
+BINDIR = $(PREFIX)/bin |
| 24 |
|
| 25 |
ifeq ($(PLATFORM),win32-i486) |
| 26 |
OZEMULATOR = $(shell $(CYGPATH) $(PREFIX)/platform/win32-i486/emulator.dll) |
| 27 |
@@ -22,11 +23,14 @@ |
| 28 |
$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR) |
| 29 |
|
| 30 |
build.ozmake: |
| 31 |
- cd ozmake && $(MAKE) ozmake.ozf |
| 32 |
+ cd ozmake && $(MAKE) ozmake |
| 33 |
|
| 34 |
install: all |
| 35 |
$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR) --install --nosavedb |
| 36 |
$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR)/ozmake --builddir=$(CYG_BUILDDIR_OZMAKE) --install --nosavedb |
| 37 |
+ mkdir -p $(BINDIR) |
| 38 |
+ cp ozmake/ozmake $(BINDIR) |
| 39 |
+ chmod +x $(BINDIR)/ozmake |
| 40 |
|
| 41 |
export CLEANDIR |
| 42 |
|
| 43 |
diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Attribs.oz mozart-1.3.2.20060615-std/ozmake/Attribs.oz |
| 44 |
--- mozart-1.3.2.20060615-std.orig/ozmake/Attribs.oz 2004-05-15 03:21:43.000000000 +1200 |
| 45 |
+++ mozart-1.3.2.20060615-std/ozmake/Attribs.oz 2007-02-17 09:29:47.000000000 +1300 |
| 46 |
@@ -458,7 +458,7 @@ |
| 47 |
end |
| 48 |
|
| 49 |
meth get_oz_home($) {Path.expand {Property.get 'oz.home'}} end |
| 50 |
- meth get_oz_bindir($) {Path.resolve Attribs,get_oz_home($) 'bin'} end |
| 51 |
+ meth get_oz_bindir($) {Path.resolve '/usr/lib/mozart' 'bin'} end |
| 52 |
meth get_oz_engine($) |
| 53 |
if @OzEngine==unit then |
| 54 |
P={Path.resolveAtom Attribs,get_oz_bindir($) 'ozengine.exe'} |
| 55 |
diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Makefile.in mozart-1.3.2.20060615-std/ozmake/Makefile.in |
| 56 |
--- mozart-1.3.2.20060615-std.orig/ozmake/Makefile.in 2004-04-01 00:52:55.000000000 +1200 |
| 57 |
+++ mozart-1.3.2.20060615-std/ozmake/Makefile.in 2007-02-17 10:55:26.000000000 +1300 |
| 58 |
@@ -37,8 +37,8 @@ |
| 59 |
|
| 60 |
# these additional 2 lines makes it possible to build in a directory |
| 61 |
# different from the source directory |
| 62 |
-OZLOAD = prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache |
| 63 |
-export OZLOAD |
| 64 |
+# OZLOAD = prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache |
| 65 |
+# export OZLOAD |
| 66 |
|
| 67 |
XSLTPROC = @VAR_XSLTPROC@ |
| 68 |
LYNX = @VAR_LYNX@ |
| 69 |
diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Makefile.vars mozart-1.3.2.20060615-std/ozmake/Makefile.vars |
| 70 |
--- mozart-1.3.2.20060615-std.orig/ozmake/Makefile.vars 2005-06-05 01:47:45.000000000 +1200 |
| 71 |
+++ mozart-1.3.2.20060615-std/ozmake/Makefile.vars 2007-02-17 08:42:20.000000000 +1300 |
| 72 |
@@ -13,6 +13,6 @@ |
| 73 |
MakeGUI.oz Fixes.oz DatabaseLib.oz CHANGES Config.oz Mogul.oz \ |
| 74 |
Pickler.oz ExecutorFast.oz Depends.oz Requires.oz |
| 75 |
PKG_INSTALLS = ozmake.ozf |
| 76 |
-PKG_INSTALLS_BIN= ozmake ozmake.win |
| 77 |
+PKG_INSTALLS_BIN= ozmake |
| 78 |
PKG_UPDATE = tgz tarz |
| 79 |
PKG_INSTALLS_DOC= index.html CHANGES |
| 80 |
diff -ur mozart-1.3.2.20060615-std.orig/ozmake/makefile.oz mozart-1.3.2.20060615-std/ozmake/makefile.oz |
| 81 |
--- mozart-1.3.2.20060615-std.orig/ozmake/makefile.oz 2004-05-22 09:37:24.000000000 +1200 |
| 82 |
+++ mozart-1.3.2.20060615-std/ozmake/makefile.oz 2007-02-17 12:15:46.000000000 +1300 |
| 83 |
@@ -4,8 +4,8 @@ |
| 84 |
mogul : 'mogul:/mozart/ozmake' |
| 85 |
author: 'mogul:/duchier/denys' |
| 86 |
lib : ['ozmake.ozf'] |
| 87 |
- bin : ['ozmake.exe'] |
| 88 |
- doc : ['index.html' 'CHANGES'] |
| 89 |
+% bin : ['ozmake.exe'] |
| 90 |
+% doc : ['index.html' 'CHANGES'] |
| 91 |
rules : |
| 92 |
o( |
| 93 |
'ozmake.ozf' : ozl('Main.ozf') |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
-- |
| 98 |
gentoo-commits@l.g.o mailing list |
Archives