Fix building with some LDFLAGS (bug #238083).

(Portage version: 13943-svn/cvs/Linux x86_64)

4 files changed, 75 insertions, 12 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index f6199dd47b9a..cbdccbf35ec0 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_python
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.17 2008/10/18 13:38:12 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.18 2009/08/07 02:41:32 arfrever Exp $
+
+  07 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mod_python-3.3.1-r1.ebuild, +files/mod_python-3.3.1-LDFLAGS.patch,
+  +files/mod_python-3.3.1-apache-2.4.patch:
+  Fix building with some LDFLAGS (bug #238083).
 
   18 Oct 2008; nixnut <nixnut@gentoo.org> mod_python-3.3.1-r1.ebuild:
   Stable on ppc wrt bug 237784
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
new file mode 100644
index 000000000000..0562f93db748
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
@@ -0,0 +1,14 @@
+--- configure.in
++++ configure.in
+@@ -267,10 +267,7 @@
+ AC_MSG_CHECKING(linker flags used to link Python)
+ AC_SUBST(LDFLAGS)
+ PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
+-PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
+-LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
+-LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
+-AC_MSG_RESULT($PY_LDFLAGS)
++LDFLAGS="${LDFLAGS} ${PyLFS}"
+ 
+ AC_MSG_CHECKING(where Python include files are)
+ AC_SUBST(INCLUDES)
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
new file mode 100644
index 000000000000..8484d08d8620
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
@@ -0,0 +1,38 @@
+TODO:
+src/requestobject.c uses ap_requires() which has been removed in r368027.
+https://svn.apache.org/viewvc?view=rev&revision=368027
+
+--- src/include/mod_python.h
++++ src/include/mod_python.h
+@@ -72,6 +72,11 @@
+ #endif
+ #endif
+ 
++#if !AP_MODULE_MAGIC_AT_LEAST(20081201,0)
++#define ap_unixd_config unixd_config
++#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms
++#endif
++
+ /* Python headers */
+ /* this gets rid of some compile warnings */
+ #if defined(_POSIX_THREADS)
+--- src/mod_python.c
++++ src/mod_python.c
+@@ -555,14 +555,14 @@
+         else {
+ 
+             /*XXX As of httpd 2.0.4, the below should be just
+-              a call to unixd_set_global_mutex_perms(mutex[n]); and
++              a call to ap_unixd_set_global_mutex_perms(mutex[n]); and
+               nothing else... For now, while 2.0.48 isn't commonplace yet,
+               this ugly code should be here */
+ 
+ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+             if  (!geteuid()) {
+-                chown(fname, unixd_config.user_id, -1);
+-                unixd_set_global_mutex_perms(mutex[n]);
++                chown(fname, ap_unixd_config.user_id, -1);
++                ap_unixd_set_global_mutex_perms(mutex[n]);
+             }
+ #endif
+         }
diff --git a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
index c621860683ed..55777bdb7d56 100644
--- a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
+++ b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.3.1-r1.ebuild,v 1.4 2008/10/18 13:38:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.3.1-r1.ebuild,v 1.5 2009/08/07 02:41:32 arfrever Exp $
 
-inherit eutils python apache-module multilib
+EAPI="2"
+
+inherit autotools eutils python apache-module multilib
 
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
@@ -23,19 +25,23 @@ DOCFILES="README NEWS CREDITS"
 
 need_apache2
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch"
+	epatch "${FILESDIR}/${P}-apache-2.4.patch"
+	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
+
 	# Remove optimisations, we do that outside Portage
 	sed -i -e 's:--optimize 2:--no-compile:' dist/Makefile.in
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-apxs=${APXS}
 }
 
 src_compile() {
-	econf --with-apxs=${APXS} || die "econf failed"
-	sed -i -e 's/ -Wl,--hash-style  $//' src/Makefile
-	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "econf failed"
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "emake failed"
 }
 
 src_install() {