Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Caleb Tennis (caleb)" <caleb@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgresql/files: postgresql-8.2.7-regress_su.patch postgresql-8.2.7-regress_fix.patch postgresql-8.2.7-sh.patch postgresql-8.2.7-gentoo.patch postgresql-8.2.7-no-test.patch postgresql-8.2.7-python-threads.patch
Date: Wed, 26 Mar 2008 13:18:03
Message-Id: E1JeVVw-0003Ph-02@stork.gentoo.org
1 caleb 08/03/26 13:17:59
2
3 Added: postgresql-8.2.7-regress_su.patch
4 postgresql-8.2.7-regress_fix.patch
5 postgresql-8.2.7-sh.patch
6 postgresql-8.2.7-gentoo.patch
7 postgresql-8.2.7-no-test.patch
8 postgresql-8.2.7-python-threads.patch
9 Log:
10 version bump
11 (Portage version: 2.1.4.4)
12
13 Revision Changes Path
14 1.1 dev-db/postgresql/files/postgresql-8.2.7-regress_su.patch
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-regress_su.patch?rev=1.1&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-regress_su.patch?rev=1.1&content-type=text/plain
18
19 Index: postgresql-8.2.7-regress_su.patch
20 ===================================================================
21 diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
22 index f2319d2..b14a6f0 100644
23 --- a/src/test/regress/GNUmakefile
24 +++ b/src/test/regress/GNUmakefile
25 @@ -148,7 +148,8 @@ ##
26 check: all
27 -rm -rf ./testtablespace
28 mkdir ./testtablespace
29 - ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
30 + chown portage testtablespace .
31 + su -s /bin/sh portage -c "./pg_regress --psqldir=`pwd`/../../bin/psql --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)"
32
33 installcheck: all
34 -rm -rf ./testtablespace
35 diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
36
37
38
39 1.1 dev-db/postgresql/files/postgresql-8.2.7-regress_fix.patch
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-regress_fix.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-regress_fix.patch?rev=1.1&content-type=text/plain
43
44 Index: postgresql-8.2.7-regress_fix.patch
45 ===================================================================
46 diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
47 index f7c35de..183a963 100644
48 --- a/src/test/regress/expected/interval.out
49 +++ b/src/test/regress/expected/interval.out
50 @@ -293,12 +293,6 @@ (10 rows)
51 -- test avg(interval), which is somewhat fragile since people have been
52 -- known to change the allowed input syntax for type interval without
53 -- updating pg_aggregate.agginitval
54 -select avg(f1) from interval_tbl;
55 - avg
56 --------------------------------------------------
57 - @ 4 years 1 mon 10 days 4 hours 18 mins 23 secs
58 -(1 row)
59 -
60 -- test long interval input
61 select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
62 interval
63 diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
64 index 9b2e625..cb44d12 100644
65 --- a/src/test/regress/sql/interval.sql
66 +++ b/src/test/regress/sql/interval.sql
67 @@ -101,9 +101,6 @@ SELECT '' AS ten, * FROM INTERVAL_TBL;
68 -- test avg(interval), which is somewhat fragile since people have been
69 -- known to change the allowed input syntax for type interval without
70 -- updating pg_aggregate.agginitval
71 -
72 -select avg(f1) from interval_tbl;
73 -
74 -- test long interval input
75 select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
76
77
78
79
80 1.1 dev-db/postgresql/files/postgresql-8.2.7-sh.patch
81
82 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-sh.patch?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-sh.patch?rev=1.1&content-type=text/plain
84
85 Index: postgresql-8.2.7-sh.patch
86 ===================================================================
87 --- postgresql-8.2.3.orig/src/include/storage/s_lock.h 2006-06-08 00:24:45.000000000 +0200
88 +++ postgresql-8.2.3/src/include/storage/s_lock.h 2007-03-29 12:25:56.000000000 +0200
89 @@ -299,6 +299,31 @@
90 #endif /* __s390__ || __s390x__ */
91
92
93 +#if defined(__sh__)
94 +#define HAS_TEST_AND_SET
95 +
96 +typedef unsigned char slock_t;
97 +
98 +#define TAS(lock) tas(lock)
99 +
100 +static __inline__ int
101 +tas(volatile slock_t *lock)
102 +{
103 + register int _res = 1;
104 +
105 + __asm__ __volatile__(
106 + "tas.b @%1\n\t"
107 + "movt %0\n\t"
108 + "xor #1,%0"
109 +: "=z"(_res)
110 +: "r"(lock)
111 +: "t","memory");
112 + return _res;
113 +}
114 +
115 +#endif /* __sh__ */
116 +
117 +
118 #if defined(__sparc__) /* Sparc */
119 #define HAS_TEST_AND_SET
120
121
122
123
124 1.1 dev-db/postgresql/files/postgresql-8.2.7-gentoo.patch
125
126 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-gentoo.patch?rev=1.1&view=markup
127 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-gentoo.patch?rev=1.1&content-type=text/plain
128
129 Index: postgresql-8.2.7-gentoo.patch
130 ===================================================================
131 --- postgresql-8.2.3.orig/src/bin/Makefile 2006-03-05 16:58:50.000000000 +0100
132 +++ postgresql-8.2.3/src/bin/Makefile 2007-03-29 12:12:26.000000000 +0200
133 @@ -14,7 +14,7 @@
134 include $(top_builddir)/src/Makefile.global
135
136 DIRS := initdb ipcclean pg_ctl pg_dump \
137 - psql scripts pg_config pg_controldata pg_resetxlog
138 + psql scripts pg_controldata pg_resetxlog
139 ifeq ($(PORTNAME), win32)
140 DIRS+=pgevent
141 endif
142 --- postgresql-8.2.3.orig/src/interfaces/Makefile 2004-04-20 02:33:51.000000000 +0200
143 +++ postgresql-8.2.3/src/interfaces/Makefile 2007-03-29 12:14:01.000000000 +0200
144 @@ -12,7 +12,7 @@
145 top_builddir = ../..
146 include $(top_builddir)/src/Makefile.global
147
148 -DIRS := libpq ecpg
149 +DIRS := ecpg
150
151 ALLDIRS := $(DIRS)
152
153 --- postgresql-8.2.3.orig/src/Makefile 2006-06-23 01:50:35.000000000 +0200
154 +++ postgresql-8.2.3/src/Makefile 2007-03-29 12:54:59.000000000 +0200
155 @@ -18,12 +18,10 @@
156 $(MAKE) -C timezone $@
157 $(MAKE) -C backend $@
158 $(MAKE) -C backend/utils/mb/conversion_procs $@
159 - $(MAKE) -C include $@
160 $(MAKE) -C interfaces $@
161 $(MAKE) -C bin $@
162 $(MAKE) -C pl $@
163 $(MAKE) -C makefiles $@
164 - $(MAKE) -C test/regress $@
165
166 install: install-local
167
168 @@ -47,7 +45,6 @@
169 $(MAKE) -C port $@
170 $(MAKE) -C timezone $@
171 $(MAKE) -C backend $@
172 - $(MAKE) -C include $@
173 $(MAKE) -C interfaces $@
174 $(MAKE) -C bin $@
175 $(MAKE) -C pl $@
176 @@ -60,12 +57,10 @@
177 -$(MAKE) -C port $@
178 -$(MAKE) -C timezone $@
179 -$(MAKE) -C backend $@
180 - -$(MAKE) -C include $@
181 -$(MAKE) -C interfaces $@
182 -$(MAKE) -C bin $@
183 -$(MAKE) -C pl $@
184 -$(MAKE) -C makefiles $@
185 - -$(MAKE) -C test $@
186 -$(MAKE) -C tutorial NO_PGXS=1 $@
187 -$(MAKE) -C test/thread $@
188 rm -f Makefile.port Makefile.global
189
190
191
192 1.1 dev-db/postgresql/files/postgresql-8.2.7-no-test.patch
193
194 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-no-test.patch?rev=1.1&view=markup
195 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-no-test.patch?rev=1.1&content-type=text/plain
196
197 Index: postgresql-8.2.7-no-test.patch
198 ===================================================================
199 diff --git a/src/Makefile b/src/Makefile
200 index 5eb7c4a..0f9fff0 100644
201 --- a/src/Makefile
202 +++ b/src/Makefile
203 @@ -22,7 +22,6 @@ all install installdirs uninstall dep de
204 $(MAKE) -C bin $@
205 $(MAKE) -C pl $@
206 $(MAKE) -C makefiles $@
207 - $(MAKE) -C test/regress $@
208
209 install: install-local
210
211
212
213
214 1.1 dev-db/postgresql/files/postgresql-8.2.7-python-threads.patch
215
216 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-python-threads.patch?rev=1.1&view=markup
217 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.7-python-threads.patch?rev=1.1&content-type=text/plain
218
219 Index: postgresql-8.2.7-python-threads.patch
220 ===================================================================
221 diff -ur a/config/python.m4 b/config/python.m4
222 --- a/config/python.m4 2006-10-16 18:24:54 +0100
223 +++ b/config/python.m4 2007-08-17 15:37:00 +0100
224 @@ -78,18 +78,4 @@
225 AC_SUBST(python_libspec)[]dnl
226 AC_SUBST(python_additional_libs)[]dnl
227
228 -# threaded python is not supported on bsd's
229 -AC_MSG_CHECKING(whether Python is compiled with thread support)
230 -pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
231 -if test "$pythreads" = "1"; then
232 - AC_MSG_RESULT(yes)
233 - case $host_os in
234 - openbsd*|freebsd*)
235 - AC_MSG_ERROR([threaded Python not supported on this platform])
236 - ;;
237 - esac
238 -else
239 - AC_MSG_RESULT(no)
240 -fi
241 -
242 ])# PGAC_CHECK_PYTHON_EMBED_SETUP
243 diff -ur a/configure b/configure
244 --- a/configure 2007-04-20 04:20:41 +0100
245 +++ b/configure 2007-08-17 15:37:20 +0100
246 @@ -5002,24 +5002,6 @@
247 echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6
248
249
250 -# threaded python is not supported on bsd's
251 -echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
252 -echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6
253 -pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
254 -if test "$pythreads" = "1"; then
255 - echo "$as_me:$LINENO: result: yes" >&5
256 -echo "${ECHO_T}yes" >&6
257 - case $host_os in
258 - openbsd*|freebsd*)
259 - { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
260 -echo "$as_me: error: threaded Python not supported on this platform" >&2;}
261 - { (exit 1); exit 1; }; }
262 - ;;
263 - esac
264 -else
265 - echo "$as_me:$LINENO: result: no" >&5
266 -echo "${ECHO_T}no" >&6
267 -fi
268
269
270 fi
271
272
273
274 --
275 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups