# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1400231356 25200
# Node ID a814d85099bf250a28f3b6e012e402d773e2acbb
# Parent  5c902a3c6e7ed01de871488457eb55c61572455a
18768070 apr-1-config should propagate LFS macros

diff -r 5c902a3c6e7e -r a814d85099bf components/apr-1_5/Makefile
--- a/components/apr-1_5/Makefile	Thu May 15 16:58:20 2014 -0700
+++ b/components/apr-1_5/Makefile	Fri May 16 02:09:16 2014 -0700
@@ -47,7 +47,7 @@
 CONFIGURE_OPTIONS +=	--enable-nonportable-atomics
 CONFIGURE_OPTIONS +=	--enable-shared
 CONFIGURE_OPTIONS +=	--disable-static
-CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) $(CPP_LARGEFILES)"
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	LTFLAGS="--tag=CC --silent"
 CONFIGURE_OPTIONS.32 +=	--enable-layout=Solaris
 CONFIGURE_OPTIONS.64 +=	--enable-layout=Solaris-$(MACH64)
diff -r 5c902a3c6e7e -r a814d85099bf components/apr-1_5/patches/largefile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/patches/largefile.patch	Fri May 16 02:09:16 2014 -0700
@@ -0,0 +1,16 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+This seems to be the only way to propagate these macros also
+into apr-1-config.
+
+--- build/apr_hints.m4	2013-10-14 12:03:08.000000000 -0700
++++ build/apr_hints.m4	2014-05-15 01:31:40.239384758 -0700
+@@ -237,6 +237,7 @@
+     *-solaris2*)
+     	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
+ 	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
++	APR_ADDTO(CPPFLAGS, [-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64])
+         if test $PLATOSVERS -ge 10; then
+             APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE])
+         else