1 |
patrick 10/02/26 15:47:42 |
2 |
|
3 |
Added: postgresql-9.0-makefile.patch |
4 |
postgresql-9.0-base.patch |
5 |
postgresql-9.0-common.patch |
6 |
Log: |
7 |
Bump to 9.0_alpha4 |
8 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-db/postgresql-base/files/postgresql-9.0-makefile.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-makefile.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-makefile.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: postgresql-9.0-makefile.patch |
17 |
=================================================================== |
18 |
--- GNUmakefile.in.old 2010-01-22 17:07:56.574071514 +0100 |
19 |
+++ GNUmakefile.in 2010-01-22 17:08:13.644073319 +0100 |
20 |
@@ -9,7 +9,6 @@ |
21 |
include $(top_builddir)/src/Makefile.global |
22 |
|
23 |
all: |
24 |
- $(MAKE) -C doc all |
25 |
$(MAKE) -C src all |
26 |
$(MAKE) -C config all |
27 |
@echo "All of PostgreSQL successfully made. Ready to install." |
28 |
@@ -18,7 +17,6 @@ |
29 |
$(MAKE) -C doc $@ |
30 |
|
31 |
install: |
32 |
- $(MAKE) -C doc $@ |
33 |
$(MAKE) -C src $@ |
34 |
$(MAKE) -C config $@ |
35 |
@echo "PostgreSQL installation complete." |
36 |
|
37 |
|
38 |
|
39 |
1.1 dev-db/postgresql-base/files/postgresql-9.0-base.patch |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-base.patch?rev=1.1&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-base.patch?rev=1.1&content-type=text/plain |
43 |
|
44 |
Index: postgresql-9.0-base.patch |
45 |
=================================================================== |
46 |
diff -Naur postgresql-8.5alpha3.orig/contrib/Makefile postgresql-8.5alpha3/contrib/Makefile |
47 |
--- postgresql-8.5alpha3.orig/contrib/Makefile 2009-03-26 00:20:01.000000000 +0100 |
48 |
+++ postgresql-8.5alpha3/contrib/Makefile 2009-07-09 21:17:38.000000000 +0200 |
49 |
@@ -5,48 +5,12 @@ |
50 |
include $(top_builddir)/src/Makefile.global |
51 |
|
52 |
SUBDIRS = \ |
53 |
- adminpack \ |
54 |
- auto_explain \ |
55 |
- btree_gin \ |
56 |
- btree_gist \ |
57 |
- chkpass \ |
58 |
- citext \ |
59 |
- cube \ |
60 |
- dblink \ |
61 |
- dict_int \ |
62 |
- dict_xsyn \ |
63 |
- earthdistance \ |
64 |
- fuzzystrmatch \ |
65 |
- hstore \ |
66 |
- intagg \ |
67 |
- intarray \ |
68 |
- isn \ |
69 |
- lo \ |
70 |
- ltree \ |
71 |
oid2name \ |
72 |
- pageinspect \ |
73 |
passwordcheck \ |
74 |
- pg_buffercache \ |
75 |
- pg_freespacemap \ |
76 |
- pg_standby \ |
77 |
- pg_stat_statements \ |
78 |
- pg_trgm \ |
79 |
pgbench \ |
80 |
- pgcrypto \ |
81 |
- pgrowlocks \ |
82 |
- pgstattuple \ |
83 |
- seg \ |
84 |
- spi \ |
85 |
- tablefunc \ |
86 |
- test_parser \ |
87 |
- tsearch2 \ |
88 |
unaccent \ |
89 |
vacuumlo |
90 |
|
91 |
-ifeq ($(with_openssl),yes) |
92 |
-SUBDIRS += sslinfo |
93 |
-endif |
94 |
- |
95 |
ifeq ($(with_ossp_uuid),yes) |
96 |
SUBDIRS += uuid-ossp |
97 |
endif |
98 |
diff -Naur postgresql-8.5alpha3.orig/src/backend/Makefile postgresql-8.5alpha3/src/backend/Makefile |
99 |
--- postgresql-8.5alpha3.orig/src/backend/Makefile 2009-01-01 18:23:34.000000000 +0100 |
100 |
+++ postgresql-8.5alpha3/src/backend/Makefile 2009-07-09 21:22:13.000000000 +0200 |
101 |
@@ -36,7 +36,7 @@ |
102 |
|
103 |
########################################################################## |
104 |
|
105 |
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) |
106 |
+all: someheaders |
107 |
|
108 |
ifneq ($(PORTNAME), cygwin) |
109 |
ifneq ($(PORTNAME), win32) |
110 |
@@ -105,7 +105,7 @@ |
111 |
endif # aix |
112 |
|
113 |
# Update the commonly used headers before building the subdirectories |
114 |
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h |
115 |
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h |
116 |
|
117 |
|
118 |
# The postgres.o target is needed by the rule in Makefile.global that |
119 |
@@ -161,23 +161,7 @@ |
120 |
|
121 |
########################################################################## |
122 |
|
123 |
-install: all installdirs install-bin |
124 |
-ifeq ($(PORTNAME), cygwin) |
125 |
-ifeq ($(MAKE_DLL), true) |
126 |
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' |
127 |
-endif |
128 |
-endif |
129 |
-ifeq ($(PORTNAME), win32) |
130 |
-ifeq ($(MAKE_DLL), true) |
131 |
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' |
132 |
-endif |
133 |
-endif |
134 |
- $(MAKE) -C catalog install-data |
135 |
- $(MAKE) -C tsearch install-data |
136 |
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' |
137 |
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' |
138 |
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' |
139 |
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' |
140 |
+install: |
141 |
|
142 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
143 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
144 |
diff -Naur postgresql-8.5alpha3.orig/src/bin/Makefile postgresql-8.5alpha3/src/bin/Makefile |
145 |
--- postgresql-8.5alpha3.orig/src/bin/Makefile 2009-01-01 18:23:53.000000000 +0100 |
146 |
+++ postgresql-8.5alpha3/src/bin/Makefile 2009-07-09 21:27:09.000000000 +0200 |
147 |
@@ -13,8 +13,8 @@ |
148 |
top_builddir = ../.. |
149 |
include $(top_builddir)/src/Makefile.global |
150 |
|
151 |
-SUBDIRS = initdb pg_ctl pg_dump \ |
152 |
- psql scripts pg_config pg_controldata pg_resetxlog |
153 |
+SUBDIRS = pg_dump \ |
154 |
+ psql scripts pg_config |
155 |
ifeq ($(PORTNAME), win32) |
156 |
SUBDIRS+=pgevent |
157 |
endif |
158 |
diff -Naur postgresql-8.5alpha3.orig/src/include/pg_config_manual.h postgresql-8.5alpha3/src/include/pg_config_manual.h |
159 |
--- postgresql-8.5alpha3.orig/src/include/pg_config_manual.h 2009-06-11 16:49:08.000000000 +0200 |
160 |
+++ postgresql-8.5alpha3/src/include/pg_config_manual.h 2009-07-09 21:27:44.000000000 +0200 |
161 |
@@ -146,7 +146,7 @@ |
162 |
* here's where to twiddle it. You can also override this at runtime |
163 |
* with the postmaster's -k switch. |
164 |
*/ |
165 |
-#define DEFAULT_PGSOCKET_DIR "/tmp" |
166 |
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" |
167 |
|
168 |
/* |
169 |
* The random() function is expected to yield values between 0 and |
170 |
diff -Naur postgresql-8.5alpha3.orig/src/Makefile postgresql-8.5alpha3/src/Makefile |
171 |
--- postgresql-8.5alpha3.orig/src/Makefile 2009-02-24 11:06:32.000000000 +0100 |
172 |
+++ postgresql-8.5alpha3/src/Makefile 2009-07-09 21:18:20.000000000 +0200 |
173 |
@@ -15,17 +15,12 @@ |
174 |
|
175 |
all install installdirs uninstall distprep: |
176 |
$(MAKE) -C port $@ |
177 |
- $(MAKE) -C timezone $@ |
178 |
$(MAKE) -C backend $@ |
179 |
- $(MAKE) -C backend/utils/mb/conversion_procs $@ |
180 |
- $(MAKE) -C backend/snowball $@ |
181 |
$(MAKE) -C include $@ |
182 |
$(MAKE) -C interfaces $@ |
183 |
$(MAKE) -C backend/replication/libpqwalreceiver $@ |
184 |
$(MAKE) -C bin $@ |
185 |
- $(MAKE) -C pl $@ |
186 |
$(MAKE) -C makefiles $@ |
187 |
- $(MAKE) -C test/regress $@ |
188 |
|
189 |
install: install-local |
190 |
|
191 |
|
192 |
|
193 |
|
194 |
1.1 dev-db/postgresql-base/files/postgresql-9.0-common.patch |
195 |
|
196 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-common.patch?rev=1.1&view=markup |
197 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-9.0-common.patch?rev=1.1&content-type=text/plain |
198 |
|
199 |
Index: postgresql-9.0-common.patch |
200 |
=================================================================== |
201 |
=== configure.in |
202 |
================================================================== |
203 |
--- configure.in 2009-06-27 02:14:47.000000000 +0200 |
204 |
+++ configure.in 2009-07-09 15:05:02.000000000 +0200 |
205 |
@@ -19,10 +19,6 @@ |
206 |
|
207 |
AC_INIT([PostgreSQL], [9.0alpha4], [pgsql-bugs@××××××××××.org]) |
208 |
|
209 |
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. |
210 |
-Untested combinations of 'autoconf' and PostgreSQL versions are not |
211 |
-recommended. You can remove the check from 'configure.in' but it is then |
212 |
-your responsibility whether the result works or not.])]) |
213 |
AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) |
214 |
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
215 |
AC_CONFIG_AUX_DIR(config) |
216 |
=== src/include/storage/s_lock.h |
217 |
================================================================== |
218 |
--- src/include/storage/s_lock.h 2009-01-01 18:24:01.000000000 +0100 |
219 |
+++ src/include/storage/s_lock.h 2009-07-09 15:03:08.000000000 +0200 |
220 |
@@ -298,6 +298,29 @@ |
221 |
|
222 |
#endif /* __s390__ || __s390x__ */ |
223 |
|
224 |
+#if defined(__sh__) |
225 |
+#define HAS_TEST_AND_SET |
226 |
+ |
227 |
+typedef unsigned char slock_t; |
228 |
+ |
229 |
+#define TAS(lock) tas(lock) |
230 |
+ |
231 |
+static __inline__ int |
232 |
+tas(volatile slock_t *lock) |
233 |
+{ |
234 |
+ register int _res = 1; |
235 |
+ |
236 |
+ __asm__ __volatile__( |
237 |
+ "tas.b @%1\n\t" |
238 |
+ "movt %0\n\t" |
239 |
+ "xor #1,%0" |
240 |
+: "=z"(_res) |
241 |
+: "r"(lock) |
242 |
+: "t","memory"); |
243 |
+ return _res; |
244 |
+} |
245 |
+ |
246 |
+#endif /* __sh__ */ |
247 |
|
248 |
#if defined(__sparc__) /* Sparc */ |
249 |
#define HAS_TEST_AND_SET |
250 |
=== src/makefiles/Makefile.darwin |
251 |
================================================================== |
252 |
--- src/makefiles/Makefile.darwin 2008-11-14 11:22:47.000000000 +0100 |
253 |
+++ src/makefiles/Makefile.darwin 2009-07-09 15:07:11.000000000 +0200 |
254 |
@@ -5,7 +5,15 @@ |
255 |
CFLAGS_SL = |
256 |
|
257 |
ifdef PGXS |
258 |
+ifdef PGXS_IN_SERVER |
259 |
+ifndef PGXS_WITH_SERVER |
260 |
+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres |
261 |
+else |
262 |
+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER} |
263 |
+endif |
264 |
+else |
265 |
BE_DLLLIBS= -bundle_loader $(bindir)/postgres |
266 |
+endif |
267 |
else |
268 |
BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres |
269 |
endif |