From de4bf7842af8a848272089e9be5f7b5d9f152155 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:27:46 -0800 Subject: we've switched to quilt; remove .pc directory ... and remove applied patches. --- .pc/.quilt_patches | 1 - .pc/.quilt_series | 1 - .pc/.version | 1 - Makefile | 6 ++---- build.scm | 34 ++++++---------------------------- continue.h | 4 ---- scm.1 | 2 +- xgen.scm | 2 +- 8 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 .pc/.quilt_patches delete mode 100644 .pc/.quilt_series delete mode 100644 .pc/.version diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches deleted file mode 100644 index 6857a8d..0000000 --- a/.pc/.quilt_patches +++ /dev/null @@ -1 +0,0 @@ -debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series deleted file mode 100644 index c206706..0000000 --- a/.pc/.quilt_series +++ /dev/null @@ -1 +0,0 @@ -series diff --git a/.pc/.version b/.pc/.version deleted file mode 100644 index 0cfbf08..0000000 --- a/.pc/.version +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/Makefile b/Makefile index cd6390b..1477c86 100644 --- a/Makefile +++ b/Makefile @@ -89,9 +89,7 @@ ufiles = pre-crt0.c ecrt0.c gmalloc.c unexec.c unexelf.c unexhp9k800.c \ # unexnext.c unexnt.c unexsgi.c unexsni.c unexsunos4.c ofiles = scm.o time.o repl.o scl.o sys.o eval.o subr.o unif.o rope.o \ continue.o findexec.o script.o debug.o -ifeq ($(ARCH),ia64) -ofiles += continue-ia64.o -endif +# continue-ia64.o ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \ Tscript.scm compile.scm Iedline.scm Idiffer.scm hobfiles = hobbit.scm scmhob.scm scmhob.h @@ -448,7 +446,7 @@ platform.txi: build.scm > platform.txi features.txi: build build.scm $(SCMLIT) -l build -e"(make-features-txi)" -scm.info: $(texifiles) features.txi platform.txi +scm.info: $(texifiles) makeinfo scm.texi --no-split -o scm.info mv scm.info scm-$(VERSION).info if [ -f $(PREVDOCS)scm.info ]; \ diff --git a/build.scm b/build.scm index c991ec4..28a768e 100644 --- a/build.scm +++ b/build.scm @@ -568,16 +568,6 @@ (nostart linux "" "" #f () ()) (dump linux "" "" #f ("unexelf.c" "gmalloc.c") ()) - (m linux-ia64 "" "-lm" "/lib/libm.so" () ()) - (c linux-ia64 "" "-lc" "/lib/libc.so" () ()) - (dlll linux-ia64 "-DSUN_DL" "-ldl" #f () ()) - (regex linux-ia64 "" "" #f () ()) - (graphics linux-ia64 "-I/usr/include/X11 -DX11" "-L/usr/X11R6/lib -lX11" - "/usr/X11R6/lib/libX11.so" () ()) - (curses linux-ia64 "" "-lcurses" "/lib/libncurses.so" () ()) - (nostart linux-ia64 "" "" #f () ()) - (dump linux-ia64 "" "" #f ("unexelf.c" "gmalloc.c") ()) - (dump irix "" "-G 0" #f () ()) (m acorn-unixlib "" "" #f () ()) @@ -1087,17 +1077,14 @@ (append objects libs))) oname))) -(define (build-continue-ia64 parms) - (and (batch:try-command - parms "gcc -o get-contoffset-ia64 get-contoffset-ia64.c") - (batch:try-command - parms "./get-contoffset-ia64 contoffset-ia64.S") - (batch:try-command - parms "gcc -c continue-ia64.S"))) - (defcommand link-c-program linux-ia64 (lambda (oname objects libs parms) - (and (build-continue-ia64 parms) + (and (and (batch:try-command + parms "gcc -o get-contoffset-ia64 get-contoffset-ia64.c") + (batch:try-command + parms "./get-contoffset-ia64 contoffset-ia64.S") + (batch:try-command + parms "gcc -c continue-ia64.S")) (batch:try-command parms "gcc" "-rdynamic" "-o" oname "continue-ia64.o" (must-be-first @@ -1581,15 +1568,6 @@ (and (batch:try-command parms "ar rc" aname objects) (batch:try-command parms "ranlib" aname) aname)))) - -(defcommand make-archive linux-ia64 - (lambda (oname objects libs parms) - (let ((aname (string-append "lib" oname ".a"))) - (and (build-continue-ia64 parms) - (batch:try-command parms "ar rc" aname objects "continue-ia64.o") - (batch:try-command parms "ranlib" aname) - aname)))) - (defcommand compile-dll-c-files *unknown* (lambda (files parms) (and (batch:try-chopped-command parms diff --git a/continue.h b/continue.h index 9139783..9f1d78f 100644 --- a/continue.h +++ b/continue.h @@ -60,10 +60,6 @@ typedef long STACKITEM; #ifdef _UNICOS # define STACK_GROWS_UP #endif -/* __hppa__ case added by tb for debian */ -#ifdef __hppa__ -# define STACK_GROWS_UP -#endif /* James Clark came up with this neat one instruction fix for continuations on the SPARC. It flushes the register windows so diff --git a/scm.1 b/scm.1 index 52a66bb..5ab0180 100644 --- a/scm.1 +++ b/scm.1 @@ -1,5 +1,5 @@ .\" dummy line -.TH 1 SCM "April 2006" +.TH SCM "April 2006" .UC 4 .SH NAME scm \- a Scheme Language Interpreter diff --git a/xgen.scm b/xgen.scm index 870c98b..8296775 100755 --- a/xgen.scm +++ b/xgen.scm @@ -1,4 +1,4 @@ -#! /usr/bin/scm \ %0 %* +#! /usr/local/bin/scm \ %0 %* - !# ;;;; "xgen.scm", Convert C Event structs to xevent.h and xevent.scm. ;; Copyright (C) 1991-2000 Free Software Foundation, Inc. -- cgit v1.2.3