sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-02 00:01:40 -04:00
Code Issues Projects Releases Wiki Activity

Fix build problems in commit aa65de042f5828968f2f6cd65f45c543a40cc3e6.

Browse Source 
The previous way didn't work for vpath builds, and make distprep was
busted too.

Reported off-list by Andres Freund.
This commit is contained in:
Robert Haas 2015-09-11 14:53:41 -04:00
parent 5cd6538345
commit 2ccc4e972e
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/Makefile
View File

@ -200,7 +200,7 @@ distprep:
$(MAKE) -C bootstrap bootparse.c bootscanner.c $(MAKE) -C bootstrap bootparse.c bootscanner.c
$(MAKE) -C catalog schemapg.h postgres.bki postgres.description postgres.shdescription $(MAKE) -C catalog schemapg.h postgres.bki postgres.description postgres.shdescription
$(MAKE) -C replication repl_gram.c repl_scanner.c $(MAKE) -C replication repl_gram.c repl_scanner.c
$(MAKE) -C storage lwlocknames.h $(MAKE) -C storage/lmgr lwlocknames.h
$(MAKE) -C utils fmgrtab.c fmgroids.h errcodes.h $(MAKE) -C utils fmgrtab.c fmgroids.h errcodes.h
$(MAKE) -C utils/misc guc-file.c $(MAKE) -C utils/misc guc-file.c
$(MAKE) -C utils/sort qsort_tuple.c $(MAKE) -C utils/sort qsort_tuple.c

3
src/backend/storage/lmgr/Makefile
View File

@ -12,7 +12,8 @@ subdir = src/backend/storage/lmgr
top_builddir = ../../../.. top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o spin.o s_lock.o predicate.o OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \
s_lock.o predicate.o
include $(top_srcdir)/src/backend/common.mk include $(top_srcdir)/src/backend/common.mk

2
src/backend/storage/lmgr/generate-lwlocknames.pl
View File

@ -23,7 +23,7 @@ print H $autogen;
print H "/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n"; print H "/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n";
print C $autogen, "\n"; print C $autogen, "\n";
print C "static char *MainLWLockNames[] = {"; print C "char *MainLWLockNames[] = {";
while (<$lwlocknames>) while (<$lwlocknames>)
{ {

3
src/backend/storage/lmgr/lwlock.c
View File

@ -95,9 +95,6 @@
#include "utils/hsearch.h" #include "utils/hsearch.h"
#endif #endif
/* Constants for lwlock names */
#include "lwlocknames.c"
/* We use the ShmemLock spinlock to protect LWLockAssign */ /* We use the ShmemLock spinlock to protect LWLockAssign */
extern slock_t *ShmemLock; extern slock_t *ShmemLock;

3
src/include/storage/lwlock.h
View File

@ -90,9 +90,10 @@ typedef union LWLockPadded
char pad[LWLOCK_PADDED_SIZE]; char pad[LWLOCK_PADDED_SIZE];
} LWLockPadded; } LWLockPadded;
extern PGDLLIMPORT LWLockPadded *MainLWLockArray; extern PGDLLIMPORT LWLockPadded *MainLWLockArray;
extern char *MainLWLockNames[];
/* Names for fixed lwlocks */ /* Names for fixed lwlocks */
#include "lwlocknames.h" #include "storage/lwlocknames.h"
/* /*
* It's a bit odd to declare NUM_BUFFER_PARTITIONS and NUM_LOCK_PARTITIONS * It's a bit odd to declare NUM_BUFFER_PARTITIONS and NUM_LOCK_PARTITIONS