Add a quick hack for building on hppa while we sort things out upstream #201114.

Package-Manager: portage-2.1.4_rc4

4 files changed, 51 insertions, 13 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 51726077afc7..ee0a90252124 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.168 2007/12/03 17:02:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.169 2007/12/04 06:42:48 vapier Exp $
+
+  04 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.7.4-signal-hack.patch, busybox-1.7.4.ebuild:
+  Add a quick hack for building on hppa while we sort things out upstream
+  #201114.
 
   03 Dec 2007; Christoph Mende <angelos@gentoo.org> busybox-1.7.4.ebuild:
   Stable on amd64 wrt bug #201036
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ee88b9c9d722..23f8878da24a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -37,6 +37,10 @@ AUX busybox-1.7.0-bb.patch 880 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 S
 MD5 743ba1bb9056833bc1f22505c9286653 files/busybox-1.7.0-bb.patch 880
 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 files/busybox-1.7.0-bb.patch 880
 SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55 files/busybox-1.7.0-bb.patch 880
+AUX busybox-1.7.4-signal-hack.patch 559 RMD160 4be7ab4379d4d4523fb7139a9ea6d1d885256612 SHA1 2427c3a5509fd04a3215c241c66291778cb19ae0 SHA256 541ab9a625acbb21ad413151f02ede8ab19e32d3a3583f5ca35d4713161bb567
+MD5 0b0faa7316d3e34a01006855d9bcedc9 files/busybox-1.7.4-signal-hack.patch 559
+RMD160 4be7ab4379d4d4523fb7139a9ea6d1d885256612 files/busybox-1.7.4-signal-hack.patch 559
+SHA256 541ab9a625acbb21ad413151f02ede8ab19e32d3a3583f5ca35d4713161bb567 files/busybox-1.7.4-signal-hack.patch 559
 AUX mdev-start.sh 2411 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 SHA1 52efb662fc0726c18da0964adf1d80571766ce01 SHA256 33f45f6f09ee28f623b4cc0dcc1e60743141d9a969c04b9566ac3d0687cb670a
 MD5 6d6f6aec47ea4f757d4836a57d2d66d5 files/mdev-start.sh 2411
 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 files/mdev-start.sh 2411
@@ -93,18 +97,18 @@ EBUILD busybox-1.7.3.ebuild 7015 RMD160 7464153bd120766c254ba789337b536ef706630e
 MD5 54c24c9876d3e5acd71223e2d866cdf5 busybox-1.7.3.ebuild 7015
 RMD160 7464153bd120766c254ba789337b536ef706630e busybox-1.7.3.ebuild 7015
 SHA256 8339ea8680e20c7df7eae1573a88fc457d21f2a88521409cd082158d550e3f70 busybox-1.7.3.ebuild 7015
-EBUILD busybox-1.7.4.ebuild 7016 RMD160 0e49b5b9d4f78c2ef0039b0666ba04246d8cc3d6 SHA1 09e23177d03166f4b7a8d7fca65c83af9e336dee SHA256 17226f754e3653bbd60ecb64dae1ec08d68223ac30d165c6db4bb69362071ab8
-MD5 3f15c7d43f266a0480e23c2cb6880649 busybox-1.7.4.ebuild 7016
-RMD160 0e49b5b9d4f78c2ef0039b0666ba04246d8cc3d6 busybox-1.7.4.ebuild 7016
-SHA256 17226f754e3653bbd60ecb64dae1ec08d68223ac30d165c6db4bb69362071ab8 busybox-1.7.4.ebuild 7016
+EBUILD busybox-1.7.4.ebuild 7077 RMD160 ebf0f0c71dd7009b3eac74a65d8322173dd798f5 SHA1 f0147a44c7c79a5bf831ace54854e6238d828074 SHA256 a03b271025ff3bed4e00b4650452f08fe0513f107451e8b12b17186f8897f30a
+MD5 ea516bf8f90892336f2eef38816d2101 busybox-1.7.4.ebuild 7077
+RMD160 ebf0f0c71dd7009b3eac74a65d8322173dd798f5 busybox-1.7.4.ebuild 7077
+SHA256 a03b271025ff3bed4e00b4650452f08fe0513f107451e8b12b17186f8897f30a busybox-1.7.4.ebuild 7077
 EBUILD busybox-1.8.2.ebuild 7048 RMD160 2c46adfaff498611ebfee6b9605e0e533edf6f78 SHA1 69d1609d60e927bcffc607adce77f5362c99c6b2 SHA256 3eb8ae5a6af44256f55ff256bef20b4f7d7e4362c05bf7b5e0881eb30fa614aa
 MD5 239d4aec9523cef751181b3766b748b3 busybox-1.8.2.ebuild 7048
 RMD160 2c46adfaff498611ebfee6b9605e0e533edf6f78 busybox-1.8.2.ebuild 7048
 SHA256 3eb8ae5a6af44256f55ff256bef20b4f7d7e4362c05bf7b5e0881eb30fa614aa busybox-1.8.2.ebuild 7048
-MISC ChangeLog 25322 RMD160 6fedfa082f87cca30c071cd421db82a2a1c703d9 SHA1 3761ba1de9f99bd40bfcfb5c238824d1b6cfc3ff SHA256 5b2d817146130b1490ac7bb64424ca9806182d4fc26946ef8feb53116f5961b6
-MD5 9c471627e3f374fc69a418c967d4102e ChangeLog 25322
-RMD160 6fedfa082f87cca30c071cd421db82a2a1c703d9 ChangeLog 25322
-SHA256 5b2d817146130b1490ac7bb64424ca9806182d4fc26946ef8feb53116f5961b6 ChangeLog 25322
+MISC ChangeLog 25521 RMD160 2bbf97d310567ead47b104096a64eb652b288083 SHA1 2688ce84dd262c7baa050bd9a94c2597059214d9 SHA256 2de16114c4b685fbe81fbba56acac9fb40a134a55305c254e8b3a874102e6926
+MD5 13f2d96ef8ab9e5963ae2cfe63ea92b3 ChangeLog 25521
+RMD160 2bbf97d310567ead47b104096a64eb652b288083 ChangeLog 25521
+SHA256 2de16114c4b685fbe81fbba56acac9fb40a134a55305c254e8b3a874102e6926 ChangeLog 25521
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -148,7 +152,7 @@ SHA256 5e2ce9089e972a240334bcca819f6424d96bb12eeafa57478ebb840523f8c12f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHVDa4KhnDs22gwa8RAl+BAJ4mjEu/EBVL7ofp5cO5Ejg2lX+ZLACdEDa2
-kPRH6vCHYHcB9BBnK3WfzSs=
-=X/TM
+iD8DBQFHVPbup/wUKkr7RBoRAiq1AJ9pxVrlwf56O+sWjIWifqFmFuxgPQCgoeKm
+O98+jqfi5ZyBIriwzBb4ybE=
+=XDIT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.7.4.ebuild b/sys-apps/busybox/busybox-1.7.4.ebuild
index 4ade07b129b9..c97bd0b08afa 100644
--- a/sys-apps/busybox/busybox-1.7.4.ebuild
+++ b/sys-apps/busybox/busybox-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.7.4.ebuild,v 1.2 2007/12/03 17:02:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.7.4.ebuild,v 1.3 2007/12/04 06:42:48 vapier Exp $
 
 inherit eutils flag-o-matic savedconfig
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/busybox-1.7.0-bb.patch
+	epatch "${FILESDIR}"/busybox-1.7.4-signal-hack.patch #201114
 
 	# work around broken ass powerpc compilers
 	use ppc64 && append-flags -mminimal-toc
diff --git a/sys-apps/busybox/files/busybox-1.7.4-signal-hack.patch b/sys-apps/busybox/files/busybox-1.7.4-signal-hack.patch
new file mode 100644
index 000000000000..ba1183055dd6
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.7.4-signal-hack.patch
@@ -0,0 +1,28 @@
+workaround while we get it fixed upstream
+
+http://bugs.gentoo.org/201114
+
+--- libbb/u_signal_names.c
++++ libbb/u_signal_names.c
+@@ -66,7 +66,7 @@
+ #ifdef SIGTERM
+ 	[SIGTERM  ] = "TERM",
+ #endif
+-#ifdef SIGSTKFLT
++#if defined(SIGSTKFLT) && SIGSTKFLT < 32
+ 	[SIGSTKFLT] = "STKFLT",
+ #endif
+ #ifdef SIGCHLD
+@@ -90,10 +90,10 @
+ #ifdef SIGURG
+ 	[SIGURG   ] = "URG",
+ #endif
+-#ifdef SIGXCPU
++#if defined(SIGXCPU) && SIGXCPU < 32
+ 	[SIGXCPU  ] = "XCPU",
+ #endif
+-#ifdef SIGXFSZ
++#if defined(SIGXFSZ) && SIGXFSZ < 32
+ 	[SIGXFSZ  ] = "XFSZ",
+ #endif
+ #ifdef SIGVTALRM