diff options
| author | Tom Lane <tgl@fedoraproject.org> | 2005-12-15 19:38:07 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@fedoraproject.org> | 2005-12-15 19:38:07 +0000 |
| commit | fc98a4f6097a1d8f1c2f5efbfb66029ddc6879f7 (patch) | |
| tree | 36986beb2b1a82240bf157781cb8648835f05c58 | |
| parent | d644a0e2b0460a61bfdbb4e3a5e687ebe3360ae2 (diff) | |
| download | postgresql-setup-fc98a4f6097a1d8f1c2f5efbfb66029ddc6879f7.tar.gz postgresql-setup-fc98a4f6097a1d8f1c2f5efbfb66029ddc6879f7.tar.xz postgresql-setup-fc98a4f6097a1d8f1c2f5efbfb66029ddc6879f7.zip | |
Fix pg_config.h, also update postgresql-test Makefile to work with 8.1.postgresql-8_1_1-3
| -rw-r--r-- | Makefile.regress | 8 | ||||
| -rw-r--r-- | pg_config.h | 26 | ||||
| -rwxr-xr-x | postgresql.spec | 6 |
3 files changed, 19 insertions, 21 deletions
diff --git a/Makefile.regress b/Makefile.regress index 9a825c2..5ec27f0 100644 --- a/Makefile.regress +++ b/Makefile.regress @@ -17,10 +17,10 @@ srcdir := . check: installcheck-parallel installcheck: cleandirs - $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) + $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql installcheck-parallel: cleandirs - $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) + $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) # The tests command the server to write into testtablespace and results. # On a SELinux-enabled system this will fail unless we mark those directories @@ -37,10 +37,10 @@ runtest: installcheck runtest-parallel: installcheck-parallel bigtest: cleandirs - $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big + $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big bigcheck: cleandirs - $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) numeric_big + $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big ## diff --git a/pg_config.h b/pg_config.h index 8e93875..4f1df24 100644 --- a/pg_config.h +++ b/pg_config.h @@ -7,24 +7,18 @@ * Note: this may well fail if user tries to use gcc's -I- option. * But that option is deprecated anyway. */ -#ifdef __i386__ -#include "pg_config_i386.h" -#endif -#ifdef __x86_64__ +#if defined(__x86_64__) #include "pg_config_x86_64.h" -#endif -#ifdef __ia64__ +#elif defined(__ia64__) #include "pg_config_ia64.h" -#endif -#ifdef __ppc__ -#include "pg_config_ppc.h" -#endif -#ifdef __ppc64__ +#elif defined(__i386__) +#include "pg_config_i386.h" +#elif defined(__ppc64__) || defined(__powerpc64__) #include "pg_config_ppc64.h" -#endif -#ifdef __s390__ -#include "pg_config_s390.h" -#endif -#ifdef __s390x__ +#elif defined(__ppc__) || defined(__powerpc__) +#include "pg_config_ppc.h" +#elif defined(__s390x__) #include "pg_config_s390x.h" +#elif defined(__s390__) +#include "pg_config_s390.h" #endif diff --git a/postgresql.spec b/postgresql.spec index 0eef07c..27ead00 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -82,7 +82,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 8.1.1 -Release: 2 +Release: 3 License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -816,6 +816,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 8.1.1-3 +- fix pg_config.h for 64-bit and ppc platforms +- update Makefile.regress (needs to --load-language=plpgsql) + * Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 8.1.1-2 - oops, looks like we want uname -i not uname -m |