From patchwork Tue Jun 17 09:36:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 32024 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0CCC9206A0 for ; Tue, 17 Jun 2014 09:37:03 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf13487146pdj.1 for ; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=2SQd2GqK4vatRABvmMLmtAO5f5LaMuyUIHSb3rMffFM=; b=JMdLj7/B8gHPwzt9/JDE+vqF9HfBoP0ajOQ8Wa0RvwC5R7of6JeLJUm4Di0J0+0wDB nfvSkQSz5Q7UnOmc3wxpA8AaKs5t4iyQFwkFSwpuMjdeq08hSPDX8MOkaFq94qQvgQKA Rkc4s3GiEkfk0cW6E2QGX7KPoMMBucQKB5yziMqHZSDk0UCvyhZrIOt6OwwGB+wRuB/s 6CZ9ZYx1825LIYXzllUO//xnOjvBb3hCkuN3XUfb3q1bY+LnyPrWZLCSfJZ7/ObSn8PN 0xkhJz518rQ4Mr/wzjuUat+j7WGlVNkb5idGtTK1x2mU8SHuQLjfhQ0WCXZvk0PZq5LF VuEA== X-Gm-Message-State: ALoCoQn5a0YPWEoxQCpyxoueI1iDJwMhsUcgF6lRakZkR3+vT2MtHbFeraIyXZCixONZuGQBYL1q X-Received: by 10.67.23.41 with SMTP id hx9mr366221pad.8.1402997823370; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.209 with SMTP id x75ls4538958qgx.46.gmail; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) X-Received: by 10.58.196.231 with SMTP id ip7mr104425vec.47.1402997823260; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id mg9si5207495vcb.58.2014.06.17.02.37.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Jun 2014 02:37:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id lf12so6201560vcb.32 for ; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) X-Received: by 10.52.185.39 with SMTP id ez7mr17750440vdc.7.1402997823130; Tue, 17 Jun 2014 02:37:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp195980vcb; Tue, 17 Jun 2014 02:37:02 -0700 (PDT) X-Received: by 10.66.158.132 with SMTP id wu4mr31450749pab.66.1402997822250; Tue, 17 Jun 2014 02:37:02 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id tp10si13866329pbc.170.2014.06.17.02.37.01 for ; Tue, 17 Jun 2014 02:37:02 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 705B36FFC8; Tue, 17 Jun 2014 09:36:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mail.openembedded.org (Postfix) with ESMTP id 1E6F06FF7A for ; Tue, 17 Jun 2014 09:36:45 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id bs8so5461418wib.13 for ; Tue, 17 Jun 2014 02:36:45 -0700 (PDT) X-Received: by 10.194.240.196 with SMTP id wc4mr35058718wjc.63.1402997805101; Tue, 17 Jun 2014 02:36:45 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id cz4sm19155671wib.23.2014.06.17.02.36.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 02:36:44 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 17 Jun 2014 11:36:38 +0200 Message-Id: <1402997798-28328-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCHv2] php 5.4.14: use pkg-config for libxml2 detection X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Koen Kooi --- ...cinclude-use-pkgconfig-for-libxml2-config.patch | 89 ++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.4.14.bb | 4 +- 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch new file mode 100644 index 0000000..479688c --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch @@ -0,0 +1,89 @@ +From 8d758d381b3c2c2118cc486a1dac312e98cfb971 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 17 Jun 2014 09:53:00 +0200 +Subject: [PATCH] acinclude: use pkgconfig for libxml2 config + +Signed-off-by: Koen Kooi +Upstream-Status: pending +--- + acinclude.m4 | 62 +++++++++++++++++++++--------------------------------------- + 1 file changed, 22 insertions(+), 40 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index c41c507..b89db84 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2528,48 +2528,30 @@ dnl + dnl Common setup macro for libxml + dnl + AC_DEFUN([PHP_SETUP_LIBXML], [ +-AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, +-[ +- +- ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" +- ++PKG_CHECK_MODULES([LIBXML], [libxml-2.0 > 2.6.11], [ ++ PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) ++ PHP_EVAL_INCLINE($LIBXML_CFLAGS) ++ ++ dnl Check that build works with given libs ++ AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [ ++ PHP_TEST_BUILD(xmlInitParser, ++ [ ++ php_cv_libxml_build_works=yes ++ ], [ ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([build test failed. Please check the config.log for details.]) ++ ], [ ++ [$]$1 ++ ]) ++ ]) ++ if test "$php_cv_libxml_build_works" = "yes"; then ++ AC_DEFINE(HAVE_LIBXML, 1, [ ]) ++ $2 ++ fi ++], [ ++ AC_MSG_ERROR([$LIBXML_PKG_ERRORS]) + ]) + +- if test -x "$ac_cv_php_xml2_config_path"; then +- XML2_CONFIG="$ac_cv_php_xml2_config_path" +- libxml_full_version=`$XML2_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxml_full_version +- IFS=$ac_IFS +- LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` +- if test "$LIBXML_VERSION" -ge "2006011"; then +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` +- PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) +- PHP_EVAL_INCLINE($LIBXML_INCS) +- +- dnl Check that build works with given libs +- AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [ +- PHP_TEST_BUILD(xmlInitParser, +- [ +- php_cv_libxml_build_works=yes +- ], [ +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([build test failed. Please check the config.log for details.]) +- ], [ +- [$]$1 +- ]) +- ]) +- if test "$php_cv_libxml_build_works" = "yes"; then +- AC_DEFINE(HAVE_LIBXML, 1, [ ]) +- fi +- $2 +- else +- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) +- fi +-ifelse([$3],[],,[else $3]) +- fi + ]) + + dnl ------------------------------------------------------------------------- +-- +1.9.3 + diff --git a/meta-oe/recipes-devtools/php/php_5.4.14.bb b/meta-oe/recipes-devtools/php/php_5.4.14.bb index 4e0efb1..3c9d3c0 100644 --- a/meta-oe/recipes-devtools/php/php_5.4.14.bb +++ b/meta-oe/recipes-devtools/php/php_5.4.14.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" PR = "${INC_PR}.0" SRC_URI += "file://acinclude-xml2-config.patch \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" + file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ + file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ + " SRC_URI_append_pn-php += "file://iconv.patch \ file://imap-fix-autofoo.patch \