Readd hppa patch. Marked ~hppa (bug #285475).

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 66 insertions, 6 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/Manifest b/dev-db/postgresql-server/Manifest
index 122bb5bb9864..4a1be907fa8b 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -2,6 +2,7 @@ AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b18
 AUX postgresql-7.3-regress.patch 3294 RMD160 babb74fa25f69bdc5b7a31fc590cc9b8c56b6cb8 SHA1 32be69b830f7fb93b39bba085a240a57b63ce16a SHA256 89f552ebe592677887c086b92c16104b7db47839ad889c3f91546191005d1016
 AUX postgresql-7.3-server.patch 2773 RMD160 14db25b2a9f20b6f1e6c87b2aea1879b3c9873f9 SHA1 605a4efee3a05922a4387206f807c68c2625aa9c SHA256 b963985a5c6fadbb79b359549d482ebd108008eaf1755fbc29ff500bd9677b2f
 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8
+AUX postgresql-7.4-hppa.patch 1433 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 SHA1 2234eff32e0ae4bdecd4b21eb9f6c7be33023652 SHA256 4424694fecd4f16655cd5ff9603489fa644175ab344498040f2c88cb0962aa6b
 AUX postgresql-7.4-regress.patch 3337 RMD160 dcd1eef99595c5ae070a6778179a1b4611810ad8 SHA1 b58a22970ff3f6c489e55fa6fc1f2a5ba27f1aec SHA256 0679c01c80b0a789789cc5e4b0317e3d8e1ec4acdbe1bd42b63eab37097fa872
 AUX postgresql-7.4-server.patch 2811 RMD160 07a11c84497d7ddeaac1266821d2dd4a75f2ea01 SHA1 3d09b0cdffdddd93de0b97b626fc91772342f640 SHA256 d31c37a7821421e289e0dcc57b743e219fe97745053a2750703647f4e2a4bd5c
 AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
@@ -42,11 +43,11 @@ DIST postgresql-8.2.14.tar.bz2 12638205 RMD160 4ee0b40b0a00eef2f626ebb23fc5eb1bf
 DIST postgresql-8.3.8.tar.bz2 14147538 RMD160 333cbc0b0d9f3f756b08b7e980691dc5671877e5 SHA1 9af0351cfdac73381bb4b06fb429345fd14930cd SHA256 fa98566463fc729b1e99f9b7419db113d65d0415a180cb2357118ad11cc26025
 DIST postgresql-8.4.1.tar.bz2 13579302 RMD160 ad03c250afd71091294a2a3e67d96b661883db87 SHA1 e6903f0029402ef8fb12645a177204499ea5b2b7 SHA256 85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
 EBUILD postgresql-server-7.3.21.ebuild 9021 RMD160 48af14ad1f0f5d9af1ab1bbee786c0c5185f2e1c SHA1 0a594f6bb163070d8a0af2fbd56fdadbaa2ad050 SHA256 52ac83e6038935db6f0edb8c7ee0fae61e68d77061c6b41bc99e155bc2d75321
-EBUILD postgresql-server-7.4.26.ebuild 8923 RMD160 42e8f18e7b49327cbbc8945ab559bdc248dc31ad SHA1 2db84cba3806df2598dee5c37f040fa479f62ecb SHA256 558e4365edd8852b9ad789bd8249fe9d5bed9d627b2262b8f9e2ec93119abe1e
+EBUILD postgresql-server-7.4.26.ebuild 8973 RMD160 fb98bb24f5d5547f8d939db61419646ebde429a9 SHA1 c560ba6de761785df488d08d6ddc6f0dfb23e5af SHA256 a1ff765a40d7e3480afb232a4199786dc4857dbc8bd491a644d7616ca44a8f87
 EBUILD postgresql-server-8.0.22.ebuild 9119 RMD160 46bf9e57a3db10b3122ae4e068c0c8ed99324942 SHA1 94005b750669def1f833a838ab2f7df21b4990ab SHA256 45449908945f9b2f18af26ed9af3db05b3c5fd1f8f15f034d60a8b86e9a42a5c
 EBUILD postgresql-server-8.1.18.ebuild 9205 RMD160 3c9050ab38f75fc080f738bea0db3cb6d10fdd3a SHA1 5020d785d56ee2cb55bd6a1b76c6d02ffffe6c8a SHA256 6084f9ba93e90832277571bf13d2bd75e9a0c2d670dbab1212f09b4b5dd6b190
 EBUILD postgresql-server-8.2.14.ebuild 9505 RMD160 811b6a652df8322ee4c5a54b1285fc3c86641c42 SHA1 9581b2d5e24ab6fa6b5f49d8173d0338521ac25c SHA256 61a07a35d05dfd5847d27fb61d3c9818802ccbf037e8ec91593c6d1bf4f80bf6
 EBUILD postgresql-server-8.3.8.ebuild 9664 RMD160 fafd2872c51483e20c58cfac2c311d15d9070099 SHA1 d2de5eecb2c9835b5dd6e970744ba36fe1467c37 SHA256 924b11179ea873c3d1975057ad25a466eb135bb793a3589eb810a7015765d0c3
 EBUILD postgresql-server-8.4.1.ebuild 9209 RMD160 3c15e8ae3077b822873216a849c833f6519ca0e8 SHA1 0f81518e140d8bbad36cb8f49ef348ab387b0ec1 SHA256 a1c1fe8c6e8f2bbf3ed05c9ceca4a3f6c7afb1aaa5cb4e6b54deb5e7074ac153
-MISC ChangeLog 14935 RMD160 dde2399ad81f9f44c9b207d4b34f03c687f9c6f9 SHA1 1b5e21e2bc3f6c41218b45135a1d77f6f0a17a9e SHA256 515c60f48d6a95066777b03c8fb65b0066940c0642250265b1bd7d02039039ed
+MISC ChangeLog 15100 RMD160 4c587d44618c6b8762452d7bb8ca18cd9f69a204 SHA1 c17fc95755b138e86c18d790335c434ea03e0bf3 SHA256 9712f3bcf7ec6eeab01595b3b23f7dd95e80b48855cd7c1c4e54ac65d58e7583
 MISC metadata.xml 278 RMD160 70d8f6a6bc3d6619380cee3c0bc2179cf6a5bf28 SHA1 ca266604cf761d9ea76b5ec298ac553156c1c21e SHA256 0ec3e7bdc08e61c19df6ef7f5a1a5a2d2aeabb001c2efca4bdfe947e71a450b0
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"