Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7107d58

Browse files
committed
Fix misplacement of submake-generated-headers prerequisites.
The sequence "configure; cd src/pl/plpython; make -j" failed due totrying to compile plpython's .o files before the generated headersfinished building. (This is an important real-world case, since it'sthe typical second step when building both plpython2 and plpython3.)This happens because the submake-generated-headers target is notplaced in a way to make it a prerequisite to compiling the .o files.Fix that.Checking other uses of submake-generated-headers, I noted that the oneattached to pg_regress was similarly misplaced; but it's actually notneeded at all for pg_regress.o, rather regress.o, so move it to be aprerequisite of that.Back-patch to 9.6 where submake-generated-headers was introduced(by commit548af97). It's not immediately clear to me why theprevious coding didn't have the same issue; but since we've nothad field reports of plpython make failing, leave it alone in theolder branches.Pavel Raiskup and Tom LaneDiscussion: <1925924.izSMJEZO3x@unused-4-107.brq.redhat.com>
1 parenta432729 commit7107d58

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

‎src/pl/plpython/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
9595

9696
include$(top_srcdir)/src/Makefile.shlib
9797

98-
all: submake-generated-headers all-lib
98+
all: all-lib
99+
100+
$(OBJS): | submake-generated-headers
99101

100102

101103
install: all install-lib install-data

‎src/test/regress/GNUmakefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
3636

3737
all: pg_regress$(X)
3838

39-
pg_regress$(X): pg_regress.o pg_regress_main.o$(WIN32RES) | submake-libpgport submake-generated-headers
39+
pg_regress$(X): pg_regress.o pg_regress_main.o$(WIN32RES) | submake-libpgport
4040
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
4141

4242
# dependencies ensure that path changes propagate
@@ -65,6 +65,8 @@ include $(top_srcdir)/src/Makefile.shlib
6565

6666
all: all-lib
6767

68+
$(OBJS): | submake-generated-headers
69+
6870
# Test input and expected files. These are created by pg_regress itself, so we
6971
# don't have a rule to create them. We do need rules to clean them however.
7072
input_files =$(patsubst$(srcdir)/input/%.source,sql/%.sql,$(wildcard$(srcdir)/input/*.source))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp