summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2012-02-17 18:12:41 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2012-02-17 18:12:41 +0000
commit3597c22cb98b17aaaa95edb351f7360a47314246 (patch)
tree23b68eec367bc16546456bbcddcb6375856a1302 /www-apache
parentAdd missing dev-libs/expat to RDEPEND, use emake, die if sed fails. (diff)
downloadhistorical-3597c22cb98b17aaaa95edb351f7360a47314246.tar.gz
historical-3597c22cb98b17aaaa95edb351f7360a47314246.tar.bz2
historical-3597c22cb98b17aaaa95edb351f7360a47314246.zip
Fix building on amd64.
Package-Manager: portage-2.1.10.46/cvs/Linux x86_64
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_caucho/ChangeLog6
-rw-r--r--www-apache/mod_caucho/Manifest20
-rw-r--r--www-apache/mod_caucho/mod_caucho-4.0.22.ebuild6
-rw-r--r--www-apache/mod_caucho/mod_caucho-4.0.25.ebuild4
4 files changed, 22 insertions, 14 deletions
diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 842d0430aa24..96e84fa36e38 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_caucho
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.62 2012/02/11 18:48:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.63 2012/02/17 18:12:41 nelchael Exp $
+
+ 17 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> mod_caucho-4.0.22.ebuild,
+ mod_caucho-4.0.25.ebuild:
+ Fix building on amd64.
*mod_caucho-4.0.25 (11 Feb 2012)
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index 922d44eaaf99..f051744328de 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -15,18 +15,18 @@ DIST resin-gentoo-patches-4.0.25.tar.bz2 2482 RMD160 085efaa3fff7359231b583b460d
EBUILD mod_caucho-4.0.13.ebuild 1086 RMD160 c2445933a00e40e6db89916bdc452bcba14496c3 SHA1 df9a8e5f83f1c47c836d22e1dcb985034babcce6 SHA256 50b28e7cde3f8dee273940314e66ecfcf1fdb0714ded6d4248b4e2635a484b60
EBUILD mod_caucho-4.0.14.ebuild 1091 RMD160 dab37ee4bb22a95d2eb47af9db1c7aeaf2c4dd10 SHA1 df705dc8b45e7bca8cc2d653712a5262c2e23d90 SHA256 155e78410e36e12b6495a380815a7854d46b13b04c408168d2bac72563c110ed
EBUILD mod_caucho-4.0.15.ebuild 1091 RMD160 08a5b29deb556955cd29a428357b4583de923d89 SHA1 d3cdf7b19b65c13e9a1ab20603ce93b44ac86c8f SHA256 a4cf068d83674e42fc308c480c36d0072dcb34bfae23a12803274697eab7b08b
-EBUILD mod_caucho-4.0.22.ebuild 1091 RMD160 b718dac00b4c47b40a7743b1f415b6313f9b353f SHA1 fea4659a0ffcb5bd3830e43d7a97072b6b3e4f5a SHA256 9e20b33ba299bf61fb9145a23a7f7f50a3004f2031630a7a0626e0f7851d103b
-EBUILD mod_caucho-4.0.25.ebuild 1091 RMD160 af17c00caafe84e422c1a09d9b4ed74596234bd0 SHA1 83e8e60e0aa282a6c5f4766c81635f3220f94de5 SHA256 0d5a29dee66339f4f967f3d338126d57aa3b5c5a7b26fa14ba0b112a1aa5c383
-MISC ChangeLog 11003 RMD160 1e5870af48656d61e7956887ff3de2b0cbdaf96f SHA1 35903d88d2a13e2d854e6f8d90cce39d4ece7915 SHA256 c1457a9330d7aa2909e4c544a64a39924786c12cf9463fecf575182726d61bba
+EBUILD mod_caucho-4.0.22.ebuild 1160 RMD160 f8dbee510d5321b28426212d16f66518c4c9f829 SHA1 ecb17d5950d907a8f929fee93ed20ea6837cdff9 SHA256 2115dec274b71b3ccceaaff88e13ea170066d398303c5df8a12111657907d8b3
+EBUILD mod_caucho-4.0.25.ebuild 1160 RMD160 cd02f865e458f36e3b71b286fe8d6241f374621d SHA1 6a31f2a52c384f478acd6728df01085f8e9686d0 SHA256 f57835ecd84a864a8d57e43b62f19f2cc0a8c5836d44e15d5d5368085b7aaf38
+MISC ChangeLog 11137 RMD160 ed96ee0479426c251be892bc6a9228979fc2221f SHA1 ad8316c434d1e048b3e2320b40ab6b9f91a7b8d3 SHA256 bd7c16d8f6cd26efb2bb1d19dd2b4575b176d21b6819294a7047f68121d5cb1b
MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPNrgFAAoJEBZyv1r2qA5Gr34H/iaKi3RFCz5I+7zEyeOC9piI
-121niS7FltaQx5ZlgxzZN4CcWghRIfsbZhp+MCOMiZR6x/YBm663WikDioa9GHn+
-ds1XcGpJRpniEs0izhduB9fThxtur+1TgqI1XCZBP97oM+PpNVl6h5jfZqFch/IW
-bFCpBkBokXkXy5bUoUTpHKfUZhShTeBemjtuBMeAZx2jqVv1SAE1rarTBrMvqrYe
-gd8/Ah/CxCoJAeI0bLQDrfFn5RMsaE1daZADLK9w4bfAx7gHVwpVAqfO84d8V9B1
-G8CyWm2FJLCtfL4YJkmdDgnifnES41ECcYc24CC5DZ0tglFeMNYdtXKCc/+oec0=
-=MxBR
+iQEcBAEBCgAGBQJPPpihAAoJEBZyv1r2qA5GjHUIAJX/5NHxs01uyo453h6z7ETb
+QzLYrnWYtsqMrS9H+bXdlze2DpCrJLgEf44eIPpuzjkdEiR6tnNjHh7qTNmmMYKl
+BRA+WuHtX5xmeGLadeZjbd72vRC7jIdzLjpeULQqDCn1nyJ++RMdNe5Z4ZFiNz3N
+SnR1fhfLZbnqaGZaNSSKdeh4NHWKhvcIXBOT+Cxj+dbfmGWGglUH2BuoiP4RLRzq
+pVZdNN5D+PrlbwFV1D4sN1h4SCULdJj1hpzpuA8Du3tdjJ65NW2qVJui0VX4ll1I
+eamTg/Y5GO8BC9j2xwUsNvs2TBrI/7azLSAvnbGfKZSzFwgnl+e1bpbET0lTxrE=
+=olAa
-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
index ef8a8f2d3c85..882778e50525 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.1 2011/09/06 16:42:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.2 2012/02/17 18:12:41 nelchael Exp $
EAPI="2"
@@ -34,6 +34,8 @@ src_prepare() {
epatch "${i}"
done
+ sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+
mkdir m4
eautoreconf
chmod 755 ./configure
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
index c8ac2f8d6880..eb3856765a5a 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.1 2012/02/11 18:48:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.2 2012/02/17 18:12:41 nelchael Exp $
EAPI="2"
@@ -34,6 +34,8 @@ src_prepare() {
epatch "${i}"
done
+ sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+
mkdir m4
eautoreconf
chmod 755 ./configure