From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Sat, 30 Jun 2012 21:11:25 +0000 (+0100)
Subject: site/common-linux: fix incorrect size of pid_t for apr
X-Git-Tag: yocto-4.0~36557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81eb71736a4d14abe85d810f9862d8a9421e9ef5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

site/common-linux: fix incorrect size of pid_t for apr

If cross-compiling, apr's configure script assumes that pid_t is
64-bit which is wrong - it appears that 32-bit is a safe assumption
for Linux no matter what the architecture, so use that instead by
default.

This fixes Apache writing garbage to its pid file when built using apr
produced from this recipe.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.6.bb
index 54c47fee4e1..896f79fe367 100644
--- a/meta/recipes-support/apr/apr_1.4.6.bb
+++ b/meta/recipes-support/apr/apr_1.4.6.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
 
 BBCLASSEXTEND = "native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://configure_fixes.patch \
diff --git a/meta/site/common-linux b/meta/site/common-linux
index f441abb73a2..8a9146eaced 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -1,5 +1,6 @@
 # apr
 ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes}
+ac_cv_sizeof_pid_t=${ac_cv_sizeof_pid_t=4}
 
 # samba
 samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}