Fix gmp alignment issue on sparc.

Package-Manager: portage-2.1.2_pre1-r4

7 files changed, 54 insertions, 25 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index b06ac3e7a318..5f6d400e7156 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.38 2006/10/02 16:53:22 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.39 2006/10/02 17:01:04 keri Exp $
+
+  02 Oct 2006; keri <keri@gentoo.org>
+  +files/swi-prolog-gmp-sparc-alignment.patch, swi-prolog-5.6.17-r1.ebuild,
+  swi-prolog-5.6.18.ebuild, swi-prolog-5.6.19.ebuild,
+  swi-prolog-5.6.20.ebuild:
+  Fix gmp alignment issue on sparc. Reported by weeve@gentoo.org in #149662.
 
   02 Oct 2006; keri <keri@gentoo.org> files/swi-prolog-parallel-build.patch:
   Parallelize fix for xpce version.h
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index a16a0035b63d..04e622548dce 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -50,6 +50,10 @@ AUX swi-prolog-db-versioned.patch 961 RMD160 b5a3ea3e46f32c12ccbfdee5c421399b91c
 MD5 3066f6d0fdba637c6dc31e1da430dc9f files/swi-prolog-db-versioned.patch 961
 RMD160 b5a3ea3e46f32c12ccbfdee5c421399b91ca2fb1 files/swi-prolog-db-versioned.patch 961
 SHA256 99e82b6511c2bf0cfc7014de7b5af8e8d924d9383192031d3f5618a1fbddc734 files/swi-prolog-db-versioned.patch 961
+AUX swi-prolog-gmp-sparc-alignment.patch 418 RMD160 feaedc52024748c0a7060c248d4c7f1e390ebcfb SHA1 b8f5f12b1102cfcaca4546703d01e9d336ddc886 SHA256 5547a1c05e3ed1353e6cceca5f57a77786ab0acd978e0254a4af2bfced9af32a
+MD5 8c1630ee80c99b96cd7b1e7caa57e285 files/swi-prolog-gmp-sparc-alignment.patch 418
+RMD160 feaedc52024748c0a7060c248d4c7f1e390ebcfb files/swi-prolog-gmp-sparc-alignment.patch 418
+SHA256 5547a1c05e3ed1353e6cceca5f57a77786ab0acd978e0254a4af2bfced9af32a files/swi-prolog-gmp-sparc-alignment.patch 418
 AUX swi-prolog-jpl-LDPATH.patch 1184 RMD160 b80d7d4267e5bcdf9d8522dd8dab3862942429fe SHA1 9a1da78c7f9fe8f474a70bc7722d0775d666ae00 SHA256 368abd48148cbb62e00ceb519d8a04e3ebc429aa26596392302bb5a0ff154dca
 MD5 919da80fcc4982596c0523b8887ee13b files/swi-prolog-jpl-LDPATH.patch 1184
 RMD160 b80d7d4267e5bcdf9d8522dd8dab3862942429fe files/swi-prolog-jpl-LDPATH.patch 1184
@@ -139,34 +143,34 @@ DIST pl-5.6.18.tar.gz 11517892 RMD160 238554526c0e0367c770d6aabb9a55900ca358b7 S
 DIST pl-5.6.19.tar.gz 11532046 RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 SHA1 95ed5c17fbe9c0159174b8ad1e8eefbbc8a8d3db SHA256 9897a7a08cd920ee6ad48f3da38d9add92f2992cf9e4339c9b17d055118702d8
 DIST pl-5.6.20.tar.gz 11528418 RMD160 3f8b25d8370485c7fc8f15d0c55d5a873869a93a SHA1 3decae180a5870684eba38492e45e479c7881e2f SHA256 10e09ce3fdd35c12fceb3e463a617a40f119b67dc23436068dd47a9388355981
 DIST pl-5.6.8.tar.gz 9157044 RMD160 449a866a9fadf13c068393f8a4f76862ecbd2207 SHA1 56de45066ba1680ebf6a74d3b7be6ab8cd23293a SHA256 4ccfd6ed684f56750c089a8103e2d640c6591873e3f36b47a2e2d39958cccdf3
-EBUILD swi-prolog-5.6.17-r1.ebuild 3649 RMD160 80794e97f9f03f1c73dd84ab1d7f3a177414549f SHA1 cdb5d8162d63a2d36b399fb22f7bc893923c409b SHA256 857af482f2d7ad49e2236b12ad9d987bd2631e79c84183eefcce9fff6af30213
-MD5 a41974ffd4099378d80353fffb74605e swi-prolog-5.6.17-r1.ebuild 3649
-RMD160 80794e97f9f03f1c73dd84ab1d7f3a177414549f swi-prolog-5.6.17-r1.ebuild 3649
-SHA256 857af482f2d7ad49e2236b12ad9d987bd2631e79c84183eefcce9fff6af30213 swi-prolog-5.6.17-r1.ebuild 3649
+EBUILD swi-prolog-5.6.17-r1.ebuild 3703 RMD160 14f11f441068ea3e40885d1321653f8bfbc74953 SHA1 465e5bd9c5cef4de2bc46c9691d60e4a565de2bd SHA256 abbdf9a6950e4cc78c97b4dbcbf77b7af1dd9fd9534ac6ba1f2dd0d549369512
+MD5 3967792dc62273d0c4d0c276bcbbb800 swi-prolog-5.6.17-r1.ebuild 3703
+RMD160 14f11f441068ea3e40885d1321653f8bfbc74953 swi-prolog-5.6.17-r1.ebuild 3703
+SHA256 abbdf9a6950e4cc78c97b4dbcbf77b7af1dd9fd9534ac6ba1f2dd0d549369512 swi-prolog-5.6.17-r1.ebuild 3703
 EBUILD swi-prolog-5.6.17.ebuild 3640 RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 SHA1 f070a1c99bec57684e022353dbdf6c6b2630d0f0 SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a
 MD5 998a2c2b1b5ebda95e28f5dae96e8f80 swi-prolog-5.6.17.ebuild 3640
 RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 swi-prolog-5.6.17.ebuild 3640
 SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a swi-prolog-5.6.17.ebuild 3640
-EBUILD swi-prolog-5.6.18.ebuild 3255 RMD160 1e4301ada0dd9ab96ff5c4f9923003e30e0066dd SHA1 316baebfd4af5d96d5006dcad607997cf68689dd SHA256 5701ca7bf304bb1dd4c7d8c92d621c116c2ef8f58a825cbe6320a83a4e874bfa
-MD5 5452ab180009e71ba6c9410d316cca39 swi-prolog-5.6.18.ebuild 3255
-RMD160 1e4301ada0dd9ab96ff5c4f9923003e30e0066dd swi-prolog-5.6.18.ebuild 3255
-SHA256 5701ca7bf304bb1dd4c7d8c92d621c116c2ef8f58a825cbe6320a83a4e874bfa swi-prolog-5.6.18.ebuild 3255
-EBUILD swi-prolog-5.6.19.ebuild 3268 RMD160 85311b52f9d59175b18c6cbfc4b692cd7a95a147 SHA1 65722f731c99c4f8d5c02db3418d482a98e4c9e2 SHA256 9a5cd8b934dbe5f043e1f051fefecd1a4dfe08dadd3d2e66f73cfc58c48c4e03
-MD5 b45f433826052058b515f72ad82cc82f swi-prolog-5.6.19.ebuild 3268
-RMD160 85311b52f9d59175b18c6cbfc4b692cd7a95a147 swi-prolog-5.6.19.ebuild 3268
-SHA256 9a5cd8b934dbe5f043e1f051fefecd1a4dfe08dadd3d2e66f73cfc58c48c4e03 swi-prolog-5.6.19.ebuild 3268
-EBUILD swi-prolog-5.6.20.ebuild 3268 RMD160 561aa384b80f9309c96094ceea4b2c60218208b3 SHA1 52b62fe587a912d7202b95d212afb42a0133ab44 SHA256 566c7e04d2c883364dae4e9a7e4b137c4bb4958130629009da687d0573d37c24
-MD5 40dabec5cb21491255bf22d0e36a5e4d swi-prolog-5.6.20.ebuild 3268
-RMD160 561aa384b80f9309c96094ceea4b2c60218208b3 swi-prolog-5.6.20.ebuild 3268
-SHA256 566c7e04d2c883364dae4e9a7e4b137c4bb4958130629009da687d0573d37c24 swi-prolog-5.6.20.ebuild 3268
+EBUILD swi-prolog-5.6.18.ebuild 3308 RMD160 dd92ad0d44042dd2bb9f3a8eba090cf29204a5ec SHA1 27a793026ed1717edf15ee811471df33b876cc26 SHA256 45a735531782d3d5ddde2642b0d8b502188eec5f11615683c1848f4bb270a24c
+MD5 2b0aa008d3e670082b47c45cbfeee122 swi-prolog-5.6.18.ebuild 3308
+RMD160 dd92ad0d44042dd2bb9f3a8eba090cf29204a5ec swi-prolog-5.6.18.ebuild 3308
+SHA256 45a735531782d3d5ddde2642b0d8b502188eec5f11615683c1848f4bb270a24c swi-prolog-5.6.18.ebuild 3308
+EBUILD swi-prolog-5.6.19.ebuild 3322 RMD160 f64dee5d199a480d9aa4440e385c8ceaf853a941 SHA1 a975092c909f6eacbe3021dd6d8de1ee6fa15061 SHA256 0720690a65f1a9372643c2c3d46e9f45790f633eb91d4faee81499993cb4b023
+MD5 787058e6c4a652940293a4e361fe70b5 swi-prolog-5.6.19.ebuild 3322
+RMD160 f64dee5d199a480d9aa4440e385c8ceaf853a941 swi-prolog-5.6.19.ebuild 3322
+SHA256 0720690a65f1a9372643c2c3d46e9f45790f633eb91d4faee81499993cb4b023 swi-prolog-5.6.19.ebuild 3322
+EBUILD swi-prolog-5.6.20.ebuild 3322 RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c1278ba SHA1 6c56d8106f9c78abdf82eda7d56c222f5812b245 SHA256 44a4d314a7ce1c8523d527f133f904c077ee963a7237edec43b0b3d1a2238fe1
+MD5 f4988adb9134d24afa4e60b410cc685b swi-prolog-5.6.20.ebuild 3322
+RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c1278ba swi-prolog-5.6.20.ebuild 3322
+SHA256 44a4d314a7ce1c8523d527f133f904c077ee963a7237edec43b0b3d1a2238fe1 swi-prolog-5.6.20.ebuild 3322
 EBUILD swi-prolog-5.6.8.ebuild 3503 RMD160 db4322b8c734af20011e4845a93427a8328ae113 SHA1 5fd4712a46f68f40565e2150be372a1831057de0 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a
 MD5 6bc8df3140ced306811de8495f5e625d swi-prolog-5.6.8.ebuild 3503
 RMD160 db4322b8c734af20011e4845a93427a8328ae113 swi-prolog-5.6.8.ebuild 3503
 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a swi-prolog-5.6.8.ebuild 3503
-MISC ChangeLog 7428 RMD160 d96ade7fe31f5ad45c31df8d3e83c34563216fe0 SHA1 0cbb8ad81552f912e6d08ec69efad053226d9c0f SHA256 0f854d7c8b3d3f16eb47766ba961ae9a800f10089e47ec0778b947f5f60665a5
-MD5 d774991cd97942070a2ea977e5b111bf ChangeLog 7428
-RMD160 d96ade7fe31f5ad45c31df8d3e83c34563216fe0 ChangeLog 7428
-SHA256 0f854d7c8b3d3f16eb47766ba961ae9a800f10089e47ec0778b947f5f60665a5 ChangeLog 7428
+MISC ChangeLog 7702 RMD160 e31227f90eddbf4edd44a097614acf07b82e5cec SHA1 16a31096f9265621829116ddfa689bb48ac64f7a SHA256 9b38e3f1cd5b0a4d971a4ecdd35a4a9714cc483f17fde5cb9e1a50a2afe41aa6
+MD5 a583840f97f50ac776a779b88e0cb2f5 ChangeLog 7702
+RMD160 e31227f90eddbf4edd44a097614acf07b82e5cec ChangeLog 7702
+SHA256 9b38e3f1cd5b0a4d971a4ecdd35a4a9714cc483f17fde5cb9e1a50a2afe41aa6 ChangeLog 7702
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
diff --git a/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch b/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch
new file mode 100644
index 000000000000..16b8da83edb2
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch
@@ -0,0 +1,15 @@
+--- pl-5.6.20.orig/src/pl-gmp.c	2006-08-28 20:19:17.000000000 +1200
++++ pl-5.6.20/src/pl-gmp.c	2006-10-02 22:25:15.000000000 +1300
+@@ -126,10 +126,8 @@
+ 
+     p++;
+     if ( wsize == sizeof(int64_t)/sizeof(word) )
+-    { int64_t *ip = (int64_t *)p;
+-
+-      n->type = V_INTEGER;
+-      n->value.i = *ip;
++    { n->type = V_INTEGER;
++      memcpy(&n->value.i, p, sizeof(int64_t));
+     } else
+     { n->type = V_MPZ;
+ 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
index f34cdec24f1d..a46f18e780c6 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.4 2006/09/30 22:00:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.5 2006/10/02 17:01:04 keri Exp $
 
 inherit autotools eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy.patch
 	epatch "${FILESDIR}"/${PN}-db-versioned.patch
 	epatch "${FILESDIR}"/${PN}-db-docs.patch
+	epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch
 	epatch "${FILESDIR}"/${PN}-jpl-ppc.patch
 	epatch "${FILESDIR}"/${PN}-jpl-install.patch
 	epatch "${FILESDIR}"/${PN}-libtai.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
index e78698dc0e93..19661130d120 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild,v 1.3 2006/09/24 09:59:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
 
 inherit eutils
 
@@ -42,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-PLBASE.patch
 	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	epatch "${FILESDIR}"/${P}-gmp-sparc-alignment.patch
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
index 2a4ce2129250..d9622f7d1d97 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild,v 1.3 2006/09/24 09:59:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
 
 inherit eutils
 
@@ -42,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
 	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
 	epatch "${FILESDIR}"/${PN}-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
index 99f801bd7356..62c0a36117c0 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild,v 1.3 2006/09/24 09:59:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
 
 inherit eutils
 
@@ -42,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
 	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
 	epatch "${FILESDIR}"/${PN}-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch