[Axiom-developer] Patch to make clef work

axiom-developer
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] Patch to make clef work

From:	David MENTRE
Subject:	[Axiom-developer] Patch to make clef work
Date:	Sun, 30 Nov 2003 13:55:12 +0100
User-agent:	Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)
Hello Tim,

I have investigated the clef issue and made a patch that makes clef work
(at least on my Debian linux machine). The patch is against latest CVS.

In fact, most of lib/ and clef/ code was not compiled because the
makefiles did not use the ${CCF} compile flags, so LINUXplatform was not
defined, so no code was compiled for openpty() and related code. :)

I have also modified the etc/axiom shell script and corresponding
Makefile to:

 - use explicitely /bin/sh

 - separate definition of AXIOM and its export

 - use clef on systems we know it works (right now, only linux)


Yours,
d.

diff -Naur -x *head -x *tail -x *my* -x *bugs* -x axiom.* -x Makefile -x *.dvi 
GOLD/axiom/src/clef/edible.c.pamphlet 
axiom-i386/axiom/src/clef/edible.c.pamphlet
--- GOLD/axiom/src/clef/edible.c.pamphlet       Fri Oct 31 18:41:42 2003
+++ axiom-i386/axiom/src/clef/edible.c.pamphlet Sun Nov 30 13:29:57 2003
@@ -205,9 +205,9 @@
        look at my terminal as the controlling terminal for the group */
     setsid();
 
-    
     serverNum = open(serverPath,O_RDWR);
-    
+    if (serverNum == -1) perror("open serverPath failed");
+
     /* since I am the child, I can close ptc, and dup pts for all it
        standard descriptors */
     if (dup2(serverNum, 0) == -1) perror("dup2 0 failed");
diff -Naur -x *head -x *tail -x *my* -x *bugs* -x axiom.* -x Makefile -x *.dvi 
GOLD/axiom/src/etc/Makefile.pamphlet axiom-i386/axiom/src/etc/Makefile.pamphlet
--- GOLD/axiom/src/etc/Makefile.pamphlet        Fri Nov 14 20:20:52 2003
+++ axiom-i386/axiom/src/etc/Makefile.pamphlet  Sun Nov 30 13:26:19 2003
@@ -13,7 +13,8 @@
 <<axiomcmd>>=
 ${OUT}/axiom: ${IN}/axiom
        @echo 1 making ${OUT}/axiom from ${IN}/axiom
-       @echo export AXIOM=${AXIOM} >${OUT}/axiom
+       @echo "#!/bin/sh" >${OUT}/axiom
+       @echo AXIOM=${AXIOM} >>${OUT}/axiom
        @cat ${IN}/axiom >>${OUT}/axiom
        @chmod +x ${OUT}/axiom
 
@@ -55,7 +56,7 @@
 <<asq>>=
 ${OUT}/asq: ${MID}/asq.c
        @echo 4 making ${OUT}/asq from ${MID}/asq.c
-       @( cd ${MID} ; gcc -o asq asq.c )
+       @( cd ${MID} ; ${CC} ${CCF} -o asq asq.c )
        @cp ${MID}/asq ${OUT}
 
 ${MID}/asq.c: ${IN}/asq.c.pamphlet
diff -Naur -x *head -x *tail -x *my* -x *bugs* -x axiom.* -x Makefile -x *.dvi 
GOLD/axiom/src/etc/axiom axiom-i386/axiom/src/etc/axiom
--- GOLD/axiom/src/etc/axiom    Thu Nov 27 19:41:13 2003
+++ axiom-i386/axiom/src/etc/axiom      Sun Nov 30 13:39:43 2003
@@ -1,3 +1,10 @@
-$AXIOM/bin/AXIOMsys
+export AXIOM
 
+system=`uname -s`
 
+if [ $system = "Linux" ]; then
+    clef -e $AXIOM/bin/AXIOMsys "$@"
+else
+    echo "Warning: I don't know if clef is supported so clef is disabled"
+    $AXIOM/bin/AXIOMsys "$@"
+fi;
diff -Naur -x *head -x *tail -x *my* -x *bugs* -x axiom.* -x Makefile -x *.dvi 
GOLD/axiom/src/lib/Makefile.pamphlet axiom-i386/axiom/src/lib/Makefile.pamphlet
--- GOLD/axiom/src/lib/Makefile.pamphlet        Sun Nov 23 17:20:16 2003
+++ axiom-i386/axiom/src/lib/Makefile.pamphlet  Sun Nov 30 13:26:07 2003
@@ -46,7 +46,7 @@
 ${OUT}/bsdsignal.o: ${MID}/bsdsignal.c
        @echo 2 making ${OUT}/bsdsignal.o from ${MID}/bsdsignal.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/bsdsignal.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/bsdsignal.c )
 
 ${DOCINT}/bsdsignal.c.dvi: ${IN}/bsdsignal.c.pamphlet
        @echo 3 making ${DOCINT}/bsdsignal.c.dvi from ${IN}/bsdsignal.c.pamphlet
@@ -78,7 +78,7 @@
 ${OUT}/cfuns-c.o: ${MID}/cfuns-c.c
        @echo 6 making ${OUT}/cfuns-c.o from ${MID}/cfuns-c.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/cfuns-c.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/cfuns-c.c )
 
 ${DOCINT}/cfuns-c.c.dvi: ${IN}/cfuns-c.c.pamphlet
        @echo 7 making ${DOCINT}/cfuns-c.c.dvi from ${IN}/cfuns-c.c.pamphlet
@@ -103,7 +103,7 @@
 ${OUT}/cursor.o: ${MID}/cursor.c
        @echo 10 making ${OUT}/cursor.o from ${MID}/cursor.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/cursor.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/cursor.c )
 
 ${DOCINT}/cursor.c.dvi: ${IN}/cursor.c.pamphlet
        @echo 11 making ${DOCINT}/cursor.c.dvi from ${IN}/cursor.c.pamphlet
@@ -128,7 +128,7 @@
 ${OUT}/edin.o: ${MID}/edin.c
        @echo 14 making ${OUT}/edin.o from ${MID}/edin.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/edin.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/edin.c )
 
 ${DOCINT}/edin.c.dvi: ${IN}/edin.c.pamphlet
        @echo 15 making ${DOCINT}/edin.c.dvi from ${IN}/edin.c.pamphlet
@@ -153,7 +153,7 @@
 ${OUT}/fnct_key.o: ${MID}/fnct_key.c
        @echo 18 making ${OUT}/fnct_key.o from ${MID}/fnct_key.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/fnct_key.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/fnct_key.c )
 
 ${DOCINT}/fnct_key.c.dvi: ${IN}/fnct_key.c.pamphlet
        @echo 19 making ${DOCINT}/fnct_key.c.dvi from ${IN}/fnct_key.c.pamphlet
@@ -178,7 +178,7 @@
 ${OUT}/halloc.o: ${MID}/halloc.c
        @echo 22 making ${OUT}/halloc.o from ${MID}/halloc.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/halloc.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/halloc.c )
 
 ${DOCINT}/halloc.c.dvi: ${IN}/halloc.c.pamphlet
        @echo 23 making ${DOCINT}/halloc.c.dvi from ${IN}/halloc.c.pamphlet
@@ -206,7 +206,7 @@
 ${OUT}/hash.o: ${MID}/hash.c
        @echo 26 making ${OUT}/hash.o from ${MID}/hash.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/hash.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/hash.c )
 
 ${DOCINT}/hash.c.dvi: ${IN}/hash.c.pamphlet
        @echo 27 making ${DOCINT}/hash.c.dvi from ${IN}/hash.c.pamphlet
@@ -231,7 +231,7 @@
 ${OUT}/openpty.o: ${MID}/openpty.c
        @echo 30 making ${OUT}/openpty.o from ${MID}/openpty.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/openpty.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/openpty.c )
 
 ${DOCINT}/openpty.c.dvi: ${IN}/openpty.c.pamphlet
        @echo 31 making ${DOCINT}/openpty.c.dvi from ${IN}/openpty.c.pamphlet
@@ -256,7 +256,7 @@
 ${OUT}/pixmap.o: ${MID}/pixmap.c
        @echo 34 making ${OUT}/pixmap.o from ${MID}/pixmap.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/pixmap.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/pixmap.c )
 
 ${DOCINT}/pixmap.c.dvi: ${IN}/pixmap.c.pamphlet
        @echo 35 making ${DOCINT}/pixmap.c.dvi from ${IN}/pixmap.c.pamphlet
@@ -281,7 +281,7 @@
 ${OUT}/prt.o: ${MID}/prt.c
        @echo 38 making ${OUT}/prt.o from ${MID}/prt.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/prt.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/prt.c )
 
 ${DOCINT}/prt.c.dvi: ${IN}/prt.c.pamphlet
        @echo 39 making ${DOCINT}/prt.c.dvi from ${IN}/prt.c.pamphlet
@@ -312,7 +312,7 @@
 ${OUT}/sockio-c.o: ${MID}/sockio-c.c
        @echo 42 making ${OUT}/sockio-c.o from ${MID}/sockio-c.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/sockio-c.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/sockio-c.c )
 
 ${DOCINT}/sockio-c.c.dvi: ${IN}/sockio-c.c.pamphlet
        @echo 43 making ${DOCINT}/sockio-c.c.dvi from ${IN}/sockio-c.c.pamphlet
@@ -337,7 +337,7 @@
 ${OUT}/spadcolors.o: ${MID}/spadcolors.c
        @echo 46 making ${OUT}/spadcolors.o from ${MID}/spadcolors.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/spadcolors.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/spadcolors.c )
 
 ${DOCINT}/spadcolors.c.dvi: ${IN}/spadcolors.c.pamphlet
        @echo 47 making ${DOCINT}/spadcolors.c.dvi from \
@@ -363,7 +363,7 @@
 ${OUT}/util.o: ${MID}/util.c
        @echo 50 making ${OUT}/util.o from ${MID}/util.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/util.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/util.c )
 
 ${DOCINT}/util.c.dvi: ${IN}/util.c.pamphlet
        @echo 51 making ${DOCINT}/util.c.dvi from ${IN}/util.c.pamphlet
@@ -388,7 +388,7 @@
 ${OUT}/wct.o: ${MID}/wct.c
        @echo 54 making ${OUT}/wct.o from ${MID}/wct.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/wct.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/wct.c )
 
 ${DOCINT}/wct.c.dvi: ${IN}/wct.c.pamphlet
        @echo 55 making ${DOCINT}/wct.c.dvi from ${IN}/wct.c.pamphlet
@@ -413,7 +413,7 @@
 ${OUT}/XDither.o: ${MID}/XDither.c
        @echo 58 making ${OUT}/XDither.o from ${MID}/XDither.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/XDither.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/XDither.c )
 
 ${DOCINT}/XDither.c.dvi: ${IN}/XDither.c.pamphlet
        @echo 59 making ${DOCINT}/XDither.c.dvi from ${IN}/XDither.c.pamphlet
@@ -438,7 +438,7 @@
 ${OUT}/XShade.o: ${MID}/XShade.c
        @echo 62 making ${OUT}/XShade.o from ${MID}/XShade.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/XShade.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/XShade.c )
 
 ${DOCINT}/XShade.c.dvi: ${IN}/XShade.c.pamphlet
        @echo 63 making ${DOCINT}/XShade.c.dvi from ${IN}/XShade.c.pamphlet
@@ -463,7 +463,7 @@
 ${OUT}/XSpadFill.o: ${MID}/XSpadFill.c
        @echo 66 making ${OUT}/XSpadFill.o from ${MID}/XSpadFill.c
        @( cd ${OUT} ; \
-       gcc -c -I${INC} ${MID}/XSpadFill.c )
+       ${CC} ${CCF} -c -I${INC} ${MID}/XSpadFill.c )
 
 ${DOCINT}/XSpadFill.c.dvi: ${IN}/XSpadFill.c.pamphlet
        @echo 67 making ${DOCINT}/XSpadFill.c.dvi from 
${IN}/XSpadFill.c.pamphlet
diff -Naur -x *head -x *tail -x *my* -x *bugs* -x axiom.* -x Makefile -x *.dvi 
GOLD/axiom/src/lib/openpty.c.pamphlet 
axiom-i386/axiom/src/lib/openpty.c.pamphlet
--- GOLD/axiom/src/lib/openpty.c.pamphlet       Fri Nov 14 20:21:30 2003
+++ axiom-i386/axiom/src/lib/openpty.c.pamphlet Sun Nov 30 13:30:17 2003
@@ -204,7 +204,7 @@
        sprintf(serv, "/dev/ttyp%02x", channelNo);
        channelNo++;
 #endif
-#if defined(SUNplatform) || defined (HP9platform) || defined(linux) 
+#if defined(SUNplatform) || defined (HP9platform) || defined(LINUXplatform) 
        static int channelNo = 0;
        static char group[] = "pqrstuvwxyzPQRST";
        static int groupNo = 0;

-- 
David MENTRE <address@hidden> -- http://www.nongnu.org/axiom/
[Prev in Thread]
Current Thread
[Next in Thread]
[Axiom-developer] Patch to make clef work, David MENTRE <=
Prev by Date: Re: [Axiom-developer] AXIOM and SuSE/TeXmacs 1.0.2.8
Next by Date: [Axiom-developer] AXIOM from cvs does not compile
Previous by thread: [Axiom-developer] About pamphlets and literate programming: how to identify identification levels?
Next by thread: RE: [Axiom-developer] AXIOM from cvs does not compile
Index(es):
- Date
- Thread