1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
diff -U 4 -H -d -r -N -- Macaulay2-0.9.2-org/Macaulay2/c/Makefile.in Macaulay2-0.9.2/Macaulay2/c/Makefile.in
--- Macaulay2-0.9.2-org/Macaulay2/c/Makefile.in 2001-08-16 00:52:01.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/c/Makefile.in 2004-04-27 21:00:55.529735512 +0200
@@ -11,9 +11,9 @@
rm -f y.tab.h y.output
############################################################
.PHONY : clean all install
YFLAGS := -vdlt
-LOADLIBES += -lm -lgc
+LOADLIBES += -lm -lgc -ldl
CNAMES := scc1.c readfile.c error.c dictionary.c list.c cprint.c type.c chk.c compat.c
HFILES := $(CNAMES:.c=.h) scc.h grammar.h
OFILES := $(CNAMES:.c=.o) grammar.o
SRCFILES := $(HFILES) $(CNAMES) grammar.y
diff -U 4 -H -d -r -N -- Macaulay2-0.9.2-org/Macaulay2/d/Makefile.in Macaulay2-0.9.2/Macaulay2/d/Makefile.in
--- Macaulay2-0.9.2-org/Macaulay2/d/Makefile.in 2002-01-10 17:46:37.000000000 +0100
+++ Macaulay2-0.9.2/Macaulay2/d/Makefile.in 2004-04-27 21:20:55.014386128 +0200
@@ -349,9 +349,9 @@
endif
../libexec/Macaulay2$(EXE) : $(ALLOBJ) $(LIBRARYFILES)
rm -f $@
- time $(PURIFYCMD) $(CC) $(LDFLAGS) $(ALLOBJ) $(LOADLIBES) $(LDLIBS) $(LINK_OUTPUT_OPTION)
+ $(PURIFYCMD) $(CC) $(LDFLAGS) $(ALLOBJ) $(LOADLIBES) -ldl -lpthread $(LDLIBS) $(LINK_OUTPUT_OPTION)
$(STRIPCMD) $@
t_main.o : types.h
t : t_main.o gmp.o stdio.o strings.o system.o varstrin.o nets.o scclib.o C.o t.o
diff -U 4 -H -d -r -N -- Macaulay2-0.9.2-org/Macaulay2/e/x_factor.cpp Macaulay2-0.9.2/Macaulay2/e/x_factor.cpp
--- Macaulay2-0.9.2-org/Macaulay2/e/x_factor.cpp 2001-08-08 03:15:34.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/e/x_factor.cpp 2004-04-27 21:05:20.549446392 +0200
@@ -3,9 +3,9 @@
//#if !defined(__MWERKS__)
#if 1
#include <assert.h>
#include <iostream.h>
-#define divides ignore_this_symbol /* bits/stl_function.h contains a generic one, sigh, gcc 3.0 */
+//#define divides ignore_this_symbol /* bits/stl_function.h contains a generic one, sigh, gcc 3.0 */
#include "interp.hpp"
#undef divides
#include "matrix.hpp"
#include "z_mod_p.hpp"
diff -U 4 -H -d -r -N -- Macaulay2-0.9.2-org/Macaulay2/m2/Makefile.in Macaulay2-0.9.2/Macaulay2/m2/Makefile.in
--- Macaulay2-0.9.2-org/Macaulay2/m2/Makefile.in 2001-08-15 22:46:13.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/m2/Makefile.in 2004-04-27 21:11:14.595623192 +0200
@@ -102,9 +102,9 @@
phase1 :: ../$(DUMPDATAFILE)
../$(DUMPDATAFILE) : $(DUMPEDM2FILES) ../libexec/Macaulay2
# phase 1: read *.m2 and dump data
rm -f ../$(DUMPDATAFILE)
- time env M2HOME=.. ../libexec/Macaulay2 -q -silent -tty '-ephase=1' \
+ env M2HOME=.. ../libexec/Macaulay2 -q -silent -tty '-ephase=1' \
@srcdir@/setup.m2 @srcdir@/dumpdata.m2 '-edump()'
else
ARGS := -silent setup.m2
endif
diff -U 4 -H -d -r -N -- Macaulay2-0.9.2-org/Macaulay2/test/Makefile.in Macaulay2-0.9.2/Macaulay2/test/Makefile.in
--- Macaulay2-0.9.2-org/Macaulay2/test/Makefile.in 2001-08-15 22:46:13.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/test/Makefile.in 2004-04-27 21:11:44.443085688 +0200
@@ -41,9 +41,9 @@
endif
%.okay : %.m2
@ echo testing $<
- @ ulimit -t 600; time env M2HOME=.. ../libexec/Macaulay2 $(ARGS) $< '-eexit(0)'
+ @ ulimit -t 600; env M2HOME=.. ../libexec/Macaulay2 $(ARGS) $< '-eexit(0)'
@ touch $@
clean :
rm -f *.okay
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/Macaulay2/Makefile.in Macaulay2-0.9.2/Macaulay2/Makefile.in
--- Macaulay2-0.9.2-orig/Macaulay2/Makefile.in 2001-08-18 21:17:15.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/Makefile.in 2004-05-14 13:35:33.266819848 +0200
@@ -8,11 +8,11 @@
include ../include/config.Makefile
VPATH = @srcdir@
-install :: $(packagedir)/COPYING $(packagedir)/CHANGES $(packagedir)/README
-$(packagedir)/COPYING : COPYING $(packagedir) ; $(INSTALL_DATA) $< "$@"
-$(packagedir)/CHANGES : CHANGES $(packagedir) ; $(INSTALL_DATA) $< "$@"
-$(packagedir)/README : README $(packagedir) ; $(INSTALL_DATA) $< "$@"
-$(packagedir):; $(INSTALL) -d "$@"
+install :: $(packagedocdir)/COPYING $(packagedocdir)/CHANGES $(packagedocdir)/README
+$(packagedocdir)/COPYING : COPYING $(packagedocdir) ; $(INSTALL_DATA) $< "$@"
+$(packagedocdir)/CHANGES : CHANGES $(packagedocdir) ; $(INSTALL_DATA) $< "$@"
+$(packagedocdir)/README : README $(packagedocdir) ; $(INSTALL_DATA) $< "$@"
+$(packagedocdir):; $(INSTALL) -d "$@"
################################# libexec
libexec :; mkdir $@
clean ::; rm -rf libexec
@@ -76,15 +76,15 @@
all ::; $(MAKE) -C emacs all
install distclean clean ::; $(MAKE) -C emacs $@
################################# libexec
-install :: $(packagedir)/libexec
-$(packagedir)/libexec:; $(INSTALL) -d "$@"
-install :: $(packagedir)/libexec/Macaulay2
-$(packagedir)/libexec/Macaulay2 : libexec/Macaulay2
- $(INSTALL_PROGRAM) $^ $(packagedir)/libexec
+install :: $(packageexecdir)/libexec
+$(packageexecdir)/libexec:; $(INSTALL) -d "$@"
+install :: $(packageexecdir)/libexec/Macaulay2
+$(packageexecdir)/libexec/Macaulay2 : libexec/Macaulay2
+ $(INSTALL_PROGRAM) $^ $(packageexecdir)/libexec
ifeq "$(DUMPDATA)" "yes"
ifeq "$(encap)" "no"
-install :: $(packagedir)/$(DUMPDATAFILE)
-$(packagedir)/$(DUMPDATAFILE) : $(DUMPDATAFILE); $(INSTALL) $< "$@"
+install :: $(packageexecdir)/$(DUMPDATAFILE)
+$(packageexecdir)/$(DUMPDATAFILE) : $(DUMPDATAFILE); $(INSTALL) $< "$@"
endif
endif
#################################
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/Macaulay2/html/Makefile.in Macaulay2-0.9.2/Macaulay2/html/Makefile.in
--- Macaulay2-0.9.2-orig/Macaulay2/html/Makefile.in 2001-08-14 05:10:18.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/html/Makefile.in 2004-05-14 13:18:10.166395216 +0200
@@ -54,7 +54,7 @@
clean::; rm -f ./*.html
clean::; rm -rf *.doc *.fn *.hl *.inv* *.cat *.src *.dct Macaulay2-index-cache
distclean: clean; rm -f Makefile
-$(packagedir)/html:; $(INSTALL) -d "$@"
-install:: $(packagedir)/html
- $(INSTALL_DATA) Makefile $(IMAGES) *.html @srcdir@/html.m2 $(packagedir)/html
+$(packagehtmldir):; $(INSTALL) -d "$@"
+install:: $(packagehtmldir)
+ $(INSTALL_DATA) Makefile $(IMAGES) *.html @srcdir@/html.m2 $(packagehtmldir)
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/Macaulay2/tutorial/Makefile.in Macaulay2-0.9.2/Macaulay2/tutorial/Makefile.in
--- Macaulay2-0.9.2-orig/Macaulay2/tutorial/Makefile.in 2001-08-14 05:10:18.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/tutorial/Makefile.in 2004-05-14 13:48:15.494943560 +0200
@@ -35,10 +35,10 @@
../../bin/M2 -e'readExamples=true' tutbook.m2 '-e exit 0'
#################################
-install:: $(packagedir)/tutorial/final
+install:: $(packagedocdir)/tutorial/final
install:: $(TUTORIALS) $(OUTPUTS)
- $(INSTALL_DATA) $^ "$(packagedir)/tutorial/final"
-$(packagedir)/tutorial/final :; $(INSTALL) -d "$@"
+ $(INSTALL_DATA) $^ "$(packagedocdir)/tutorial/final"
+$(packagedocdir)/tutorial/final :; $(INSTALL) -d "$@"
#################################
clean :
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/bin/M2-final.in Macaulay2-0.9.2/bin/M2-final.in
--- Macaulay2-0.9.2-orig/bin/M2-final.in 2001-08-15 15:52:20.000000000 +0200
+++ Macaulay2-0.9.2/bin/M2-final.in 2004-05-14 12:45:00.298901056 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
-M2HOME="`dirname $0`/../Macaulay2"
+M2HOME="/usr/share/Macaulay2-0.9.2"
export M2HOME
-EXE="$M2HOME/libexec/Macaulay2"
-DATA="$M2HOME/libexec/Macaulay2-`uname -m |sed s=/=-=g`-data"
+EXE="/usr/libexec/Macaulay2"
+DATA="/usr/libexec/Macaulay2-`uname -m |sed s=/=-=g`-data"
SETUP="$M2HOME/m2/setup.m2"
if [ -f "$DATA" ]
then exec "$EXE" "-e loaddata \"$DATA\"" -- "-e runStartFunctions()" "$@"
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/bin/M2-help.in Macaulay2-0.9.2/bin/M2-help.in
--- Macaulay2-0.9.2-orig/bin/M2-help.in 2002-01-09 17:21:35.000000000 +0100
+++ Macaulay2-0.9.2/bin/M2-help.in 2004-05-14 12:45:48.760533768 +0200
@@ -1,3 +1,3 @@
#! /bin/sh
-M2HOME="`dirname $0`/../Macaulay2"
+M2HOME="/usr/share/doc/Macaulay2-0.9.2"
${WWBROWSER:-netscape} "$M2HOME/html/index.html"
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/bin/Makefile.in Macaulay2-0.9.2/bin/Makefile.in
--- Macaulay2-0.9.2-orig/bin/Makefile.in 2002-01-09 17:21:35.000000000 +0100
+++ Macaulay2-0.9.2/bin/Makefile.in 2004-05-14 13:16:46.060181304 +0200
@@ -10,8 +10,8 @@
install :: $(bindir)/M2
$(bindir)/M2 : M2-final.in
$(INSTALL) -d $(bindir)
- sed -e 's,^M2HOME=.*,M2HOME=$(prefix)/lib/Macaulay2-@PACKAGE_VERSION@,' $< >"$@".tmp
- mv "$@".tmp "$@"
+ #sed -e 's,^M2HOME=.*,M2HOME=$(prefix)/lib/Macaulay2-@PACKAGE_VERSION@,' $< >"$@".tmp
+ mv M2-final.in "$@"
chmod 0755 "$@"
all :: M2-help
@@ -20,8 +20,8 @@
install :: $(bindir)/M2-help
$(bindir)/M2-help : M2-help
$(INSTALL) -d $(bindir)
- sed -e 's,^M2HOME=.*,M2HOME=$(prefix)/lib/Macaulay2-@PACKAGE_VERSION@,' $< >"$@".tmp
- mv "$@".tmp "$@"
+ #sed -e 's,^M2HOME=.*,M2HOME=$(prefix)/lib/Macaulay2-@PACKAGE_VERSION@,' $< >"$@".tmp
+ mv M2-help.in "$@"
chmod 0755 "$@"
clean :; rm -f M2
diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/include/config.Makefile.in Macaulay2-0.9.2/include/config.Makefile.in
--- Macaulay2-0.9.2-orig/include/config.Makefile.in 2002-01-09 17:21:35.000000000 +0100
+++ Macaulay2-0.9.2/include/config.Makefile.in 2004-05-14 13:05:36.563960200 +0200
@@ -57,7 +57,11 @@
target = $(prefix)
endif
-packagedir = $(target)/lib/$(package)
+packagedir = $(target)/share/$(package)
+packageexecdir = $(target)
+packagedocdir = $(target)/share/doc/$(package)
+packagehtmldir = $(target)/share/doc/$(package)/html
+
bindir = $(target)/bin
RANLIB = @RANLIB@
--- Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp 1999-09-09 23:47:12.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp.new 2004-12-13 11:48:17.208554431 +0100
@@ -104,8 +104,6 @@
};
class EGB1 : public EGroebnerComputation
{
- class iterator;
- friend class iterator;
private:
// Ring information
const EInterface I;
@@ -255,6 +253,9 @@
virtual int new_calc(const EStopConditions &stop);
+ class iterator;
+ friend class iterator;
+
class iterator {
const EGB1 *comp;
int i;
--- Macaulay2-0.9.2/include/config.Makefile.in 2004-12-13 12:29:02.776249827 +0100
+++ Macaulay2-0.9.2/include/config.Makefile.in.new 2004-12-13 12:47:35.221607868 +0100
@@ -110,13 +110,6 @@
ifeq "$(GCC)" "yes"
CFLAGS += -Wall -Wshadow -Wcast-qual
CXXFLAGS += -Wall -Wshadow -Wcast-qual
-ifeq "$(OPTIMIZE)" "yes"
-CFLAGS += -O3 -fexpensive-optimizations
-CXXFLAGS += -O3 -fexpensive-optimizations
-else
-CFLAGS += -O0
-CXXFLAGS += -O0
-endif
endif
ifeq "$(STRIP)" "no"
|