[88512] trunk/dports/www/mod_perl2

[cal at macports.org]

Revision: 88512
          http://trac.macports.org/changeset/88512
Author:   cal at macports.org
Date:     2012-01-03 15:44:34 -0800 (Tue, 03 Jan 2012)
Log Message:
-----------
mod_perl2: Fix build with clang (code assumes GNU89), check for perl +shared +threads, closes #32200

Modified Paths:
--------------
    trunk/dports/www/mod_perl2/Portfile

Added Paths:
-----------
    trunk/dports/www/mod_perl2/files/
    trunk/dports/www/mod_perl2/files/clang-compatibility_src-modules-perl-modperl_common_util.h.patch

Modified: trunk/dports/www/mod_perl2/Portfile
===================================================================
--- trunk/dports/www/mod_perl2/Portfile	2012-01-03 22:12:22 UTC (rev 88511)
+++ trunk/dports/www/mod_perl2/Portfile	2012-01-03 23:44:34 UTC (rev 88512)
@@ -31,6 +31,22 @@
 depends_lib			path:bin/perl:perl5 port:apache2
 worksrcdir			mod_perl-${version}
 
+if {${configure.compiler} == "clang"} {
+    patchfiles-append clang-compatibility_src-modules-perl-modperl_common_util.h.patch
+}
+
+pre-configure {
+    set perl5bin "${prefix}/bin/perl5"
+    if ![exec ${perl5bin} -MConfig -e "print \$Config{'useshrplib'} || 0"] {
+        ui_error "${name} requires perl5 to be installed with the +shared variant."
+        return -code error "perl5 must be +shared"
+    }
+    if ![exec ${perl5bin} -MConfig -e "print \$Config{'usethreads'} || 0"] {
+        ui_error "${name} requires perl5 to be installed with the +threads variant."
+        return -code error "perl5 must be +threads"
+    }
+}
+
 configure { 
 	set APXS ${prefix}/apache2/bin/apxs
 	system "cd ${workpath}/${worksrcdir} && \

Added: trunk/dports/www/mod_perl2/files/clang-compatibility_src-modules-perl-modperl_common_util.h.patch
===================================================================
--- trunk/dports/www/mod_perl2/files/clang-compatibility_src-modules-perl-modperl_common_util.h.patch	                        (rev 0)
+++ trunk/dports/www/mod_perl2/files/clang-compatibility_src-modules-perl-modperl_common_util.h.patch	2012-01-03 23:44:34 UTC (rev 88512)
@@ -0,0 +1,11 @@
+--- src/modules/perl/modperl_common_util.h.orig	2012-01-04 00:25:57.000000000 +0100
++++ src/modules/perl/modperl_common_util.h	2012-01-04 00:26:12.000000000 +0100
+@@ -22,7 +22,7 @@
+ #ifdef MP_DEBUG
+ #define MP_INLINE
+ #else
+-#define MP_INLINE APR_INLINE
++#define MP_INLINE
+ #endif
+ 
+ #ifdef CYGWIN
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120103/af4fd7f7/attachment.html>