[gentoo-commits] gentoo-x86 commit in dev-db/postgresql/files: postgresql-8.2.6-sh.patch postgresql-8.2.6-regress_su.patch postgresql-8.2.6-gentoo.patch postgresql-8.2.6-python-threads.patch postgresql-8.2.6-regress_fix.patch digest-postgresql-8.2.6 postgresql-8.2.6-no-test.patch

[Martin Jackson (mjolnir)]

mjolnir     08/01/13 01:44:22

  Added:                postgresql-8.2.6-sh.patch
                        postgresql-8.2.6-regress_su.patch
                        postgresql-8.2.6-gentoo.patch
                        postgresql-8.2.6-python-threads.patch
                        postgresql-8.2.6-regress_fix.patch
                        digest-postgresql-8.2.6
                        postgresql-8.2.6-no-test.patch
  Log:
  Bump to 8.2.6 for #204760.  Thanks to Michael Kefeder for ebuilds.
  (Portage version: 2.1.4)

Revision  Changes    Path
1.1                  dev-db/postgresql/files/postgresql-8.2.6-sh.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-sh.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-sh.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-sh.patch
===================================================================
--- postgresql-8.2.3.orig/src/include/storage/s_lock.h	2006-06-08 00:24:45.000000000 +0200
+++ postgresql-8.2.3/src/include/storage/s_lock.h	2007-03-29 12:25:56.000000000 +0200
@@ -299,6 +299,31 @@
 #endif	 /* __s390__ || __s390x__ */
 
 
+#if defined(__sh__)
+#define HAS_TEST_AND_SET
+
+typedef unsigned char slock_t;
+
+#define TAS(lock) tas(lock)
+
+static __inline__ int
+tas(volatile slock_t *lock)
+{
+       register int _res = 1;
+
+       __asm__ __volatile__(
+               "tas.b  @%1\n\t"
+               "movt   %0\n\t"
+               "xor    #1,%0"
+:               "=z"(_res)
+:               "r"(lock)
+:               "t","memory");
+       return _res;
+}
+
+#endif  /* __sh__ */
+
+
 #if defined(__sparc__)		/* Sparc */
 #define HAS_TEST_AND_SET
 



1.1                  dev-db/postgresql/files/postgresql-8.2.6-regress_su.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-regress_su.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-regress_su.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-regress_su.patch
===================================================================
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index f2319d2..b14a6f0 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -148,7 +148,8 @@ ##
 check: all
 	-rm -rf ./testtablespace
 	mkdir ./testtablespace
-	./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)
+	chown portage testtablespace .
+	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)"
 
 installcheck: all
 	-rm -rf ./testtablespace
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c



1.1                  dev-db/postgresql/files/postgresql-8.2.6-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-gentoo.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-gentoo.patch
===================================================================
--- postgresql-8.2.3.orig/src/bin/Makefile	2006-03-05 16:58:50.000000000 +0100
+++ postgresql-8.2.3/src/bin/Makefile	2007-03-29 12:12:26.000000000 +0200
@@ -14,7 +14,7 @@
 include $(top_builddir)/src/Makefile.global
 
 DIRS := initdb ipcclean pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog
+	psql scripts pg_controldata pg_resetxlog
 ifeq ($(PORTNAME), win32)
 DIRS+=pgevent
 endif
--- postgresql-8.2.3.orig/src/interfaces/Makefile	2004-04-20 02:33:51.000000000 +0200
+++ postgresql-8.2.3/src/interfaces/Makefile	2007-03-29 12:14:01.000000000 +0200
@@ -12,7 +12,7 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS := libpq ecpg 
+DIRS := ecpg 
 
 ALLDIRS := $(DIRS) 

--- postgresql-8.2.3.orig/src/Makefile	2006-06-23 01:50:35.000000000 +0200
+++ postgresql-8.2.3/src/Makefile	2007-03-29 12:54:59.000000000 +0200
@@ -18,12 +18,10 @@
 	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
-	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
-	$(MAKE) -C test/regress $@
 
 install: install-local
 
@@ -47,7 +45,6 @@
 	$(MAKE) -C port $@
 	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
-	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
@@ -60,12 +57,10 @@
 	-$(MAKE) -C port $@
 	-$(MAKE) -C timezone $@
 	-$(MAKE) -C backend $@
-	-$(MAKE) -C include $@
 	-$(MAKE) -C interfaces $@
 	-$(MAKE) -C bin $@
 	-$(MAKE) -C pl $@
 	-$(MAKE) -C makefiles $@
-	-$(MAKE) -C test $@
 	-$(MAKE) -C tutorial NO_PGXS=1 $@
 	-$(MAKE) -C test/thread $@
 	rm -f Makefile.port Makefile.global



1.1                  dev-db/postgresql/files/postgresql-8.2.6-python-threads.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-python-threads.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-python-threads.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-python-threads.patch
===================================================================
diff -ur a/config/python.m4 b/config/python.m4
--- a/config/python.m4	2006-10-16 18:24:54 +0100
+++ b/config/python.m4	2007-08-17 15:37:00 +0100
@@ -78,18 +78,4 @@
 AC_SUBST(python_libspec)[]dnl
 AC_SUBST(python_additional_libs)[]dnl
 
-# threaded python is not supported on bsd's
-AC_MSG_CHECKING(whether Python is compiled with thread support)
-pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
-if test "$pythreads" = "1"; then
-  AC_MSG_RESULT(yes)
-  case $host_os in
-  openbsd*|freebsd*)
-    AC_MSG_ERROR([threaded Python not supported on this platform])
-    ;;
-  esac
-else
-  AC_MSG_RESULT(no)
-fi
-
 ])# PGAC_CHECK_PYTHON_EMBED_SETUP
diff -ur a/configure b/configure
--- a/configure	2007-04-20 04:20:41 +0100
+++ b/configure	2007-08-17 15:37:20 +0100
@@ -5002,24 +5002,6 @@
 echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6
 
 
-# threaded python is not supported on bsd's
-echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
-echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6
-pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
-if test "$pythreads" = "1"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  case $host_os in
-  openbsd*|freebsd*)
-    { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
-echo "$as_me: error: threaded Python not supported on this platform" >&2;}
-   { (exit 1); exit 1; }; }
-    ;;
-  esac
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
 
 fi



1.1                  dev-db/postgresql/files/postgresql-8.2.6-regress_fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-regress_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-regress_fix.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-regress_fix.patch
===================================================================
diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
index f7c35de..183a963 100644
--- a/src/test/regress/expected/interval.out
+++ b/src/test/regress/expected/interval.out
@@ -293,12 +293,6 @@ (10 rows)
 -- test avg(interval), which is somewhat fragile since people have been
 -- known to change the allowed input syntax for type interval without
 -- updating pg_aggregate.agginitval
-select avg(f1) from interval_tbl;
-                       avg                       
--------------------------------------------------
- @ 4 years 1 mon 10 days 4 hours 18 mins 23 secs
-(1 row)
-
 -- test long interval input
 select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
                   interval                  
diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
index 9b2e625..cb44d12 100644
--- a/src/test/regress/sql/interval.sql
+++ b/src/test/regress/sql/interval.sql
@@ -101,9 +101,6 @@ SELECT '' AS ten, * FROM INTERVAL_TBL;
 -- test avg(interval), which is somewhat fragile since people have been
 -- known to change the allowed input syntax for type interval without
 -- updating pg_aggregate.agginitval
-
-select avg(f1) from interval_tbl;
-
 -- test long interval input
 select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
 



1.1                  dev-db/postgresql/files/digest-postgresql-8.2.6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/digest-postgresql-8.2.6?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/digest-postgresql-8.2.6?rev=1.1&content-type=text/plain

Index: digest-postgresql-8.2.6
===================================================================
MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117



1.1                  dev-db/postgresql/files/postgresql-8.2.6-no-test.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-no-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.2.6-no-test.patch?rev=1.1&content-type=text/plain

Index: postgresql-8.2.6-no-test.patch
===================================================================
diff --git a/src/Makefile b/src/Makefile
index 5eb7c4a..0f9fff0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,6 @@ all install installdirs uninstall dep de
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
-	$(MAKE) -C test/regress $@
 
 install: install-local
 



-- 
gentoo-commits@l.g.o mailing list