mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Changes to deal with the sigcheck+intrcheck vs. signalmodule controversy.

Browse source
This commit is contained in:
Guido van Rossum 1998-10-07 22:51:56 +00:00
parent 2e23c3125a
commit 2a570049ac
4 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -432,6 +432,7 @@ Makefiles: config.status Modules/Makefile.pre
(echo making Makefile in subdirectory $$i; cd $$i; \ (echo making Makefile in subdirectory $$i; cd $$i; \
$(MAKE) Makefile); \ $(MAKE) Makefile); \
done done
-(rm -f Modules/hassignal; cd Modules; $(MAKE) hassignal)
# Build the intermediate Makefile in Modules # Build the intermediate Makefile in Modules
Modules/Makefile.pre: config.status Modules/Makefile.pre: config.status

18
Modules/Makefile.pre.in
View file

@ -110,12 +110,10 @@ all: $(OBJS)
# To deal with the conflict between signalmodule.o and # To deal with the conflict between signalmodule.o and
# sigcheck.o+intrcheck.o, we remove the latter two if we have the former. # sigcheck.o+intrcheck.o, we remove the latter two if we have the former.
add2lib: $(OBJS) add2lib: $(OBJS)
-for i in $(OBJS); do \ -if test -f hassignal; \
if test "$$i" = "signalmodule.o"; then \ then echo removing sigcheck.o intrcheck.o; \
$(AR) d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; \ $(AR) d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; \
break; \ else echo leaving sigcheck.o intrcheck.o in; fi
fi; \
done
$(AR) cr $(LIBRARY) $(OBJS) $(AR) cr $(LIBRARY) $(OBJS)
touch add2lib touch add2lib
@ -152,6 +150,14 @@ config.c Makefile:
-rm -f $(LIBRARY) -rm -f $(LIBRARY)
$(SHELL) $(MAKESETUP) Setup.thread Setup.local Setup $(SHELL) $(MAKESETUP) Setup.thread Setup.local Setup
hassignal:
-rm -f hassignal
-for i in $(OBJS); do \
if test "$$i" = "signalmodule.o"; then \
echo yes >hassignal; break; \
fi; \
done
Setup: Setup:
cp $(srcdir)/Setup.in Setup cp $(srcdir)/Setup.in Setup

9
Parser/Makefile.in
View file

@ -34,7 +34,9 @@ POBJS= acceler.o grammar1.o \
parsetok.o tokenizer.o bitset.o \ parsetok.o tokenizer.o bitset.o \
metagrammar.o metagrammar.o
OBJS= $(POBJS) intrcheck.o myreadline.o AROBJS= $(POBJS) myreadline.o
OBJS= $(AROBJS) intrcheck.o
PGENMAIN= pgenmain.o PGENMAIN= pgenmain.o
@ -54,7 +56,10 @@ all: $(PGEN) $(OBJS)
# This target is used by the master Makefile to add the objects to the library # This target is used by the master Makefile to add the objects to the library
add2lib: $(OBJS) add2lib: $(OBJS)
$(AR) cr $(LIBRARY) $(OBJS) $(AR) cr $(LIBRARY) $(AROBJS)
if test ! -f ../Modules/hassignal; \
then echo adding intrcheck.o; $(AR) r $(LIBRARY) intrcheck.o; \
else echo leaving intrcheck.o out; fi
touch add2lib touch add2lib
$(PGEN): $(PGENOBJS) $(PGEN): $(PGENOBJS)

10
Python/Makefile.in
View file

@ -34,7 +34,7 @@ SHELL= /bin/sh
# === Fixed definitions === # === Fixed definitions ===
OBJS= \ AROBJS= \
bltinmodule.o \ bltinmodule.o \
ceval.o compile.o \ ceval.o compile.o \
errors.o \ errors.o \
@ -44,9 +44,10 @@ OBJS= \
import.o importdl.o \ import.o importdl.o \
marshal.o modsupport.o mystrtoul.o \ marshal.o modsupport.o mystrtoul.o \
pyfpe.o pystate.o pythonrun.o \ pyfpe.o pystate.o pythonrun.o \
sigcheck.o structmember.o sysmodule.o \ structmember.o sysmodule.o \
traceback.o \ traceback.o \
$(LIBOBJS) $(LIBOBJS)
OBJS= $(AROBJS) sigcheck.o
LIBRARY= ../libpython$(VERSION).a LIBRARY= ../libpython$(VERSION).a
@ -57,7 +58,10 @@ all: $(OBJS)
# This target is used by the master Makefile to add the objects to the library # This target is used by the master Makefile to add the objects to the library
add2lib: $(OBJS) add2lib: $(OBJS)
$(AR) cr $(LIBRARY) $(OBJS) $(AR) cr $(LIBRARY) $(AROBJS)
if test ! -f ../Modules/hassignal; \
then echo adding sigcheck.o; $(AR) r $(LIBRARY) sigcheck.o; \
else echo leaving sigcheck.o out; fi
touch add2lib touch add2lib
clean: clean: