1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
diff -Naur a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
--- a/contrib/adminpack/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/contrib/adminpack/Makefile 2012-05-20 10:02:56.705637432 -0400
@@ -2,7 +2,7 @@
MODULE_big = adminpack
OBJS = adminpack.o
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
EXTENSION = adminpack
DATA = adminpack--1.0.sql
diff -Naur a/contrib/dblink/Makefile b/contrib/dblink/Makefile
--- a/contrib/dblink/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/contrib/dblink/Makefile 2012-05-20 10:03:36.338139189 -0400
@@ -2,7 +2,7 @@
MODULE_big = dblink
OBJS = dblink.o
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
SHLIB_LINK = $(libpq)
SHLIB_PREREQS = submake-libpq
diff -Naur a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/contrib/Makefile 2012-05-20 10:05:21.330819252 -0400
@@ -26,7 +26,6 @@
isn \
lo \
ltree \
- oid2name \
pageinspect \
passwordcheck \
pg_archivecleanup \
@@ -39,7 +38,6 @@
pg_trgm \
pg_upgrade \
pg_upgrade_support \
- pgbench \
pgcrypto \
pgrowlocks \
pgstattuple \
@@ -49,8 +47,7 @@
tcn \
test_parser \
tsearch2 \
- unaccent \
- vacuumlo
+ unaccent
ifeq ($(with_openssl),yes)
SUBDIRS += sslinfo
diff -Naur a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
--- a/contrib/uuid-ossp/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/contrib/uuid-ossp/Makefile 2012-05-20 10:06:57.251613365 -0400
@@ -6,7 +6,7 @@
EXTENSION = uuid-ossp
DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
-SHLIB_LINK += $(OSSP_UUID_LIBS)
+SHLIB_LINK += -lossp-uuid
ifdef USE_PGXS
PG_CONFIG = pg_config
diff -Naur a/contrib/xml2/Makefile b/contrib/xml2/Makefile
--- a/contrib/xml2/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/contrib/xml2/Makefile 2012-05-20 10:07:40.202073404 -0400
@@ -8,7 +8,8 @@
REGRESS = xml2
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
+PG_CPPFLAGS = $(shell xml2-config --cflags)
+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
ifdef USE_PGXS
PG_CONFIG = pg_config
diff -Naur a/GNUmakefile.in b/GNUmakefile.in
--- a/GNUmakefile.in 2012-05-10 18:35:09.000000000 -0400
+++ b/GNUmakefile.in 2012-05-20 10:09:31.035680036 -0400
@@ -8,7 +8,7 @@
top_builddir = .
include $(top_builddir)/src/Makefile.global
-$(call recurse,all install,src config)
+$(call recurse,all install,src)
all:
+@echo "All of PostgreSQL successfully made. Ready to install."
@@ -16,7 +16,7 @@
docs:
$(MAKE) -C doc all
-$(call recurse,world,doc src config contrib,all)
+$(call recurse,world,doc src contrib,all)
world:
+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
@@ -32,14 +32,14 @@
install-docs:
$(MAKE) -C doc install
-$(call recurse,install-world,doc src config contrib,install)
+$(call recurse,install-world,doc src contrib,install)
install-world:
+@echo "PostgreSQL, contrib, and documentation installation complete."
# build src/ before contrib/
install-world-contrib-recurse: install-world-src-recurse
-$(call recurse,installdirs uninstall coverage,doc src config)
+$(call recurse,installdirs uninstall coverage,doc src)
$(call recurse,distprep,doc src config contrib)
diff -Naur a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
--- a/src/bin/initdb/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/src/bin/initdb/Makefile 2012-05-20 10:11:07.706464719 -0400
@@ -16,7 +16,7 @@
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq -I$(top_srcdir)/src/timezone $(CPPFLAGS)
# use system timezone data?
ifneq (,$(with_system_tzdata))
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/src/bin/Makefile 2012-05-20 10:12:05.619736652 -0400
@@ -13,8 +13,7 @@
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-SUBDIRS = initdb pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
+SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
ifeq ($(PORTNAME), win32)
SUBDIRS += pgevent
diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
--- a/src/include/pg_config_manual.h 2012-05-10 18:35:09.000000000 -0400
+++ b/src/include/pg_config_manual.h 2012-05-20 10:13:33.358633625 -0400
@@ -144,7 +144,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
-#define DEFAULT_PGSOCKET_DIR "/tmp"
+#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@@RUNDIR@/run/postgresql"
/*
* The random() function is expected to yield values between 0 and
diff -Naur a/src/Makefile b/src/Makefile
--- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/src/Makefile 2012-05-20 10:15:28.923180781 -0400
@@ -18,12 +18,9 @@
backend \
backend/utils/mb/conversion_procs \
backend/snowball \
- include \
- interfaces \
backend/replication/libpqwalreceiver \
bin \
pl \
- makefiles \
test/regress
# There are too many interdependencies between the subdirectories, so
@@ -32,7 +29,7 @@
$(recurse)
-install: install-local
+install:
install-local: installdirs-local
$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
diff -Naur a/src/Makefile.global.in b/src/Makefile.global.in
--- a/src/Makefile.global.in 2012-05-10 18:35:09.000000000 -0400
+++ b/src/Makefile.global.in 2012-05-20 10:16:23.701492126 -0400
@@ -482,6 +482,7 @@
LDFLAGS += $(PROFILE)
endif
+CFLAGS += -I$(top_srcdir)/src/include
##########################################################################
#
diff -Naur a/src/port/Makefile b/src/port/Makefile
--- a/src/port/Makefile 2012-05-10 18:35:09.000000000 -0400
+++ b/src/port/Makefile 2012-05-20 10:18:09.773158623 -0400
@@ -37,11 +37,10 @@
# foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
OBJS_SRV = $(OBJS:%.o=%_srv.o)
-all: libpgport.a libpgport_srv.a
+all: libpgport_srv.a
# libpgport is needed by some contrib
-install: all installdirs
- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+install:
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
|
GitWeb