diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-10-14 00:23:48 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-10-14 00:23:48 +0000 |
| commit | 69c64a6377b630556aab9240843745590f82a005 (patch) | |
| tree | 45f248d41a18ae7fa3795bd6768cdbcfb03d5275 /dev-db | |
| parent | Fix by pyon for USE=multislot and info collisions #288877. (diff) | |
| download | gentoo-2-69c64a6377b630556aab9240843745590f82a005.tar.gz gentoo-2-69c64a6377b630556aab9240843745590f82a005.tar.bz2 gentoo-2-69c64a6377b630556aab9240843745590f82a005.zip | |
Readd hppa patch. Marked ~hppa (bug #285475).
(Portage version: 2.2_rc46/cvs/Linux i686)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/postgresql-server/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/postgresql-server/files/postgresql-7.4-hppa.patch | 54 | ||||
| -rw-r--r-- | dev-db/postgresql-server/postgresql-server-7.4.26.ebuild | 7 |
3 files changed, 63 insertions, 4 deletions
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog index 49fb3fe7b700..6e84f79a9b1d 100644 --- a/dev-db/postgresql-server/ChangeLog +++ b/dev-db/postgresql-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/postgresql-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.27 2009/10/13 15:24:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.28 2009/10/14 00:23:47 jer Exp $ + + 14 Oct 2009; Jeroen Roovers <jer@gentoo.org> + postgresql-server-7.4.26.ebuild, +files/postgresql-7.4-hppa.patch: + Readd hppa patch. Marked ~hppa (bug #285475). 13 Oct 2009; Jeroen Roovers <jer@gentoo.org> postgresql-server-8.4.1.ebuild: diff --git a/dev-db/postgresql-server/files/postgresql-7.4-hppa.patch b/dev-db/postgresql-server/files/postgresql-7.4-hppa.patch new file mode 100644 index 000000000000..f19eb385371b --- /dev/null +++ b/dev-db/postgresql-server/files/postgresql-7.4-hppa.patch @@ -0,0 +1,54 @@ +diff --git a/src/include/port/linux.h b/src/include/port/linux.h +index 159db31..bef4c9e 100644 +--- a/src/include/port/linux.h ++++ b/src/include/port/linux.h +@@ -3,6 +3,11 @@ typedef unsigned char slock_t; + + #define HAS_TEST_AND_SET + ++#elif defined(__hppa__) ++typedef struct { int sema[4]; } slock_t; ++ ++#define HAS_TEST_AND_SET ++ + #elif defined(__sparc__) + typedef unsigned char slock_t; + +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index 578d8cf..ceed34a 100644 +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -112,6 +112,33 @@ tas(volatile slock_t *lock) + + #endif /* __i386__ || __x86_64__ */ + ++#if defined(__hppa__) || defined(__hppa) ++#define TAS(lock) tas(lock) ++ ++#define __ldcw(a) ({ \ ++ unsigned int __ret; \ ++ __asm__ __volatile__("ldcw 0(%2),%0" \ ++ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \ ++ __ret; \ ++}) ++ ++#define __PA_LDCW_ALIGNMENT 16 ++#define __ldcw_align(a) ({ \ ++ volatile unsigned int __ret = (unsigned int) a; \ ++ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \ ++ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \ ++ (unsigned int *) __ret; \ ++}) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ volatile unsigned int *a = __ldcw_align (lock); ++ return (__ldcw(a) == 0); ++} ++ ++#endif /* __hppa__ || __hppa */ ++ + + /* Intel Itanium */ + #if defined(__ia64__) || defined(__ia64) diff --git a/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild index 2b94a6b78703..0891dd8ebd62 100644 --- a/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild +++ b/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild,v 1.1 2009/10/03 16:28:56 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild,v 1.2 2009/10/14 00:23:47 jer Exp $ EAPI="1" @@ -8,7 +8,7 @@ WANT_AUTOCONF="latest" WANT_AUTOMAKE="none" inherit eutils multilib toolchain-funcs versionator autotools -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~hppa ~x86" DESCRIPTION="PostgreSQL server" HOMEPAGE="http://www.postgresql.org/" @@ -51,7 +51,8 @@ src_unpack() { epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ "${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch" \ - "${FILESDIR}/postgresql-${SLOT}-server.patch" + "${FILESDIR}/postgresql-${SLOT}-server.patch" \ + "${FILESDIR}/postgresql-${SLOT}-hppa.patch" if hasq test ${FEATURES}; then epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch" |