* [gentoo-commits] gentoo-x86 commit in www-apache/mod_caucho: mod_caucho-4.0.25.ebuild mod_caucho-4.0.22.ebuild ChangeLog
@ 2012-02-17 18:12 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-02-17 18:12 UTC (permalink / raw
To: gentoo-commits
nelchael 12/02/17 18:12:41
Modified: mod_caucho-4.0.25.ebuild mod_caucho-4.0.22.ebuild
ChangeLog
Log:
Fix building on amd64.
(Portage version: 2.1.10.46/cvs/Linux x86_64)
Revision Changes Path
1.2 www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?r1=1.1&r2=1.2
Index: mod_caucho-4.0.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_caucho-4.0.25.ebuild 11 Feb 2012 18:48:31 -0000 1.1
+++ mod_caucho-4.0.25.ebuild 17 Feb 2012 18:12:41 -0000 1.2
@@ -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 @@
epatch "${i}"
done
+ sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+
mkdir m4
eautoreconf
chmod 755 ./configure
1.2 www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?r1=1.1&r2=1.2
Index: mod_caucho-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_caucho-4.0.22.ebuild 6 Sep 2011 16:42:52 -0000 1.1
+++ mod_caucho-4.0.22.ebuild 17 Feb 2012 18:12:41 -0000 1.2
@@ -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 @@
epatch "${i}"
done
+ sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+
mkdir m4
eautoreconf
chmod 755 ./configure
1.63 www-apache/mod_caucho/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 11 Feb 2012 18:48:31 -0000 1.62
+++ ChangeLog 17 Feb 2012 18:12:41 -0000 1.63
@@ -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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-apache/mod_caucho: mod_caucho-4.0.25.ebuild mod_caucho-4.0.22.ebuild ChangeLog
@ 2012-02-22 20:52 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-02-22 20:52 UTC (permalink / raw
To: gentoo-commits
nelchael 12/02/22 20:52:53
Modified: mod_caucho-4.0.25.ebuild mod_caucho-4.0.22.ebuild
ChangeLog
Log:
Fix bug #404533 and bug #405193: compilation without JDK and using LDFLAGS.
(Portage version: 2.1.10.47/cvs/Linux x86_64)
Revision Changes Path
1.3 www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild?r1=1.2&r2=1.3
Index: mod_caucho-4.0.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_caucho-4.0.25.ebuild 17 Feb 2012 18:12:41 -0000 1.2
+++ mod_caucho-4.0.25.ebuild 22 Feb 2012 20:52:53 -0000 1.3
@@ -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.2 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.3 2012/02/22 20:52:53 nelchael Exp $
EAPI="2"
@@ -34,7 +34,12 @@
epatch "${i}"
done
- sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+ sed -i \
+ -e 's,-m32,,g; s,-m64,,g;' \
+ configure.ac || die "sed for configure.ac failed"
+ sed -i \
+ -e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
+ modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
mkdir m4
eautoreconf
@@ -42,7 +47,7 @@
}
src_configure() {
- econf --with-apxs=${APXS} || die "econf failed"
+ econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
}
src_compile() {
1.3 www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild?r1=1.2&r2=1.3
Index: mod_caucho-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_caucho-4.0.22.ebuild 17 Feb 2012 18:12:41 -0000 1.2
+++ mod_caucho-4.0.22.ebuild 22 Feb 2012 20:52:53 -0000 1.3
@@ -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.22.ebuild,v 1.2 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.3 2012/02/22 20:52:53 nelchael Exp $
EAPI="2"
@@ -34,7 +34,13 @@
epatch "${i}"
done
- sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+ sed -i \
+ -e 's,-m32,,g; s,-m64,,g;' \
+ -e '/.*Java 1.6 required.*/d' \
+ configure.ac || die "sed for configure.ac failed"
+ sed -i \
+ -e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
+ modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
mkdir m4
eautoreconf
@@ -42,7 +48,7 @@
}
src_configure() {
- econf --with-apxs=${APXS} || die "econf failed"
+ econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
}
src_compile() {
1.64 www-apache/mod_caucho/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_caucho/ChangeLog?r1=1.63&r2=1.64
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog 17 Feb 2012 18:12:41 -0000 1.63
+++ ChangeLog 22 Feb 2012 20:52:53 -0000 1.64
@@ -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.63 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.64 2012/02/22 20:52:53 nelchael Exp $
+
+ 22 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> mod_caucho-4.0.22.ebuild,
+ mod_caucho-4.0.25.ebuild:
+ Fix bug #404533 and bug #405193: compilation without JDK and using LDFLAGS.
17 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> mod_caucho-4.0.22.ebuild,
mod_caucho-4.0.25.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-22 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-22 20:52 [gentoo-commits] gentoo-x86 commit in www-apache/mod_caucho: mod_caucho-4.0.25.ebuild mod_caucho-4.0.22.ebuild ChangeLog Krzysztof Pawlik (nelchael)
-- strict thread matches above, loose matches on Subject: below --
2012-02-17 18:12 Krzysztof Pawlik (nelchael)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox