apr fixes v2

Since v1, rebase on latest master (removing now merged patch to add libtool) and use site file to set pid_t type.

The following changes since commit 54429dfcca0e35a3aeaa78e509240b87d6a8f4ac:

mklibs-native: Upgrade to 0.1.34 (2012-06-29 13:21:19 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/apr-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/apr-fixes

Paul Eggleton (2):
apr: add util-linux to DEPENDS for libuuid site/common-linux: fix incorrect size of pid_t for apr

 meta/recipes-support/apr/apr_1.4.6.bb |    3 ++-
 meta/site/common-linux                |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

1.7.9.5

apr will use libuuid if it is present, and thus we should require that it is there so that we have a deterministic build.

---
 meta/recipes-support/apr/apr_1.4.6.bb |    1 +
 1 file changed, 1 insertion(+)

index 6cd37f1..54c47fe 100644
@@ -1,6 +1,7 @@
 DESCRIPTION = "Apache Portable Runtime (APR) library"
 HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
+DEPENDS = "util-linux"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \

1.7.9.5

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.

---
 meta/recipes-support/apr/apr_1.4.6.bb |    2 +-
 meta/site/common-linux                |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

index 54c47fe..896f79f 100644
@@ -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 \

index f441abb..8a9146e 100644
@@ -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}

1.7.9.5

thanks for second iteration. Looks good now

Merged into OE-Core

Thanks
Sau!