[92153] trunk/dports/www/mod_jk

[jmr at macports.org]

Revision: 92153
          https://trac.macports.org/changeset/92153
Author:   jmr at macports.org
Date:     2012-04-20 08:52:19 -0700 (Fri, 20 Apr 2012)
Log Message:
-----------
mod_jk: fix universal build (#29765)

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

Added Paths:
-----------
    trunk/dports/www/mod_jk/files/
    trunk/dports/www/mod_jk/files/common_portable.h.ed
    trunk/dports/www/mod_jk/files/configure_universal.patch

Modified: trunk/dports/www/mod_jk/Portfile
===================================================================
--- trunk/dports/www/mod_jk/Portfile	2012-04-20 14:49:46 UTC (rev 92152)
+++ trunk/dports/www/mod_jk/Portfile	2012-04-20 15:52:19 UTC (rev 92153)
@@ -71,6 +71,13 @@
 	}
 }
 
+if {[variant_isset universal]} {
+    patchfiles-append   configure_universal.patch
+    post-configure {
+        system -W ${worksrcpath}/common "ed - ./portable.h < ${filespath}/common_portable.h.ed && touch ./stamp-h1"
+    }
+}
+
 destroot {
 	# Install the connector for apache2
 	xinstall -m 755 -d \

Added: trunk/dports/www/mod_jk/files/common_portable.h.ed
===================================================================
--- trunk/dports/www/mod_jk/files/common_portable.h.ed	                        (rev 0)
+++ trunk/dports/www/mod_jk/files/common_portable.h.ed	2012-04-20 15:52:19 UTC (rev 92153)
@@ -0,0 +1,8 @@
+/#define SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+w

Added: trunk/dports/www/mod_jk/files/configure_universal.patch
===================================================================
--- trunk/dports/www/mod_jk/files/configure_universal.patch	                        (rev 0)
+++ trunk/dports/www/mod_jk/files/configure_universal.patch	2012-04-20 15:52:19 UTC (rev 92153)
@@ -0,0 +1,14 @@
+--- configure.orig	2008-10-29 10:43:27.000000000 +1100
++++ configure	2012-04-21 01:39:16.000000000 +1000
+@@ -23851,11 +23851,6 @@
+     uint64_t_fmt='#define JK_UINT64_T_FMT "u"'
+     uint64_t_hex_fmt='#define JK_UINT64_T_HEX_FMT "x"'
+     int64_value="int"
+-elif test "$ac_cv_sizeof_long" = "8"; then
+-    int64_t_fmt='#define JK_INT64_T_FMT "ld"'
+-    uint64_t_fmt='#define JK_UINT64_T_FMT "lu"'
+-    uint64_t_hex_fmt='#define JK_UINT64_T_HEX_FMT "lx"'
+-    int64_value="long"
+ elif test "$ac_cv_sizeof_long_long" = "8"; then
+     # Linux, Solaris, FreeBSD all support ll with printf.
+     # BSD 4.4 originated 'q'.  Solaris is more popular and
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120420/0a440a9f/attachment.html>