[Axiom-developer] viewman and hyper on Mac OS X

[Humberto Ortiz-Zuazaga]

I patched src/graph/sselect.c.pamphlet (well, first I patched the .c
file, but I wised up before mailing the patch, shouldn't notangle mangle
line numbers in C sources so they point at the pamphlets?)

I guess Macs have BSD style signals:

Sat Nov  4 14:32:19 GMT+4 2006  Humberto Ortiz-Zuazaga
<address@hidden>
  * mac-sselect
diff -rN -u old-axiom-darcs/src/graph/viewman/sselect.c.pamphlet
new-axiom-darcs/src/graph/viewman/sselect.c.pamphlet
--- old-axiom-darcs/src/graph/viewman/sselect.c.pamphlet
2006-11-04 14:34:48.000000000 -0400
+++ new-axiom-darcs/src/graph/viewman/sselect.c.pamphlet
2006-11-04 14:34:49.000000000 -0400
@@ -104,7 +104,7 @@
        /* flush(spadSock); */
         /* send_int(spadSock,1);   acknowledge to spad */
         checkClosedChild = no;
-#if defined(BSDplatform)
+#if defined(BSDplatform) || defined(MACOSXplatform)
         bsdSignal(SIGCHLD,endChild,DontRestartSystemCalls);
 #else
         bsdSignal(SIGCLD,endChild,DontRestartSystemCalls);


and viewman now compiles. Next problem is hyper, the Mac doesn't have
regexp.h:


Sat Nov  4 14:06:48 GMT+4 2006  Humberto Ortiz-Zuazaga
<address@hidden>
  * regex-mac
diff -rN -u old-axiom-darcs/src/hyper/hthits.pamphlet
new-axiom-darcs/src/hyper/hthits.pamphlet
--- old-axiom-darcs/src/hyper/hthits.pamphlet   2006-11-04
14:23:58.000000000 -0400
+++ new-axiom-darcs/src/hyper/hthits.pamphlet   2006-11-04
14:23:59.000000000 -0400
@@ -71,7 +71,12 @@
 /* AIX3 regexp.h includes NLregexp which we don't want */
 #undef _XOPEN_SOURCE
 #endif
+#if !defined(MACOSXplatform)
+/* Mac OS X doesn't have regexp.h */
 # include <regexp.h>
+#else
+#include <regex.h>
+#endif

 /*
  * Global variables set according to the command line.

Hyper still fails to build:

13 making /Users/humberto/src/axiom-darcs/src/hyper
gcc -O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -DMACOSXplatform
      -I/usr/include -I/usr/include/sys
-I/Users/humberto/src/axiom-darcs/src/include -I. -I/usr/X11R6/include
  -c -o hthits.o hthits.c
hthits.c: In function 'main':
hthits.c:121: warning: implicit declaration of function 'compile'
hthits.c: In function 'searchPage':
hthits.c:365: warning: implicit declaration of function 'step'
hthits.c:368: error: 'loc2' undeclared (first use in this function)
hthits.c:368: error: (Each undeclared identifier is reported only once
hthits.c:368: error: for each function it appears in.)
make[2]: *** [hthits.o] Error 1
make[1]: *** [hyper/stamp] Error 2
make: *** [all-recursive] Error 1

I can't figure out what loc2 is supposed to be, I can't see any
definition in any of the other pamphlets in the hyper directory.

-- 
Humberto Ortiz-Zuazaga
Programmer-Archaeologist
University of Puerto Rico
http://www.hpcf.upr.edu/~humberto/

signature.asc
Description: OpenPGP digital signature