mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-04 18:35:24 +01:00
a67db8fcbd
Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
SPDX-FileCopyrightText: 2011 Antoine Pitrou <solipsis@pitrou.net>
|
|
|
|
SPDX-License-Identifier: PSF-2.0
|
|
|
|
Don't run pgen twice when using make -j
|
|
Don't ignore pgen error (on "make Parser/pgen.stamp")
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 25a82aff01..03f85fd04b 100644
|
|
--- Python-2.5.6/Makefile.pre.in
|
|
+++ Python-2.5.6/Makefile.pre.in
|
|
@@ -471,10 +471,12 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
|
Modules/python.o: $(srcdir)/Modules/python.c
|
|
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
|
|
|
|
-
|
|
-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
|
|
+# Use a stamp file to prevent make -j invoking pgen twice
|
|
+$(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
|
|
+Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
|
|
-@ mkdir Include
|
|
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
|
+ $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
|
+ -touch Parser/pgen.stamp
|
|
|
|
$(PGEN): $(PGENOBJS)
|
|
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
|
|
@@ -1030,7 +1032,7 @@ clean: pycremoval
|
|
|
|
clobber: clean
|
|
-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
|
|
- tags TAGS \
|
|
+ tags TAGS Parser/pgen.stamp \
|
|
config.cache config.log pyconfig.h Modules/config.c
|
|
-rm -rf build platform
|
|
-rm -rf $(PYTHONFRAMEWORKDIR)
|