From patchwork Tue Jun 17 08:15:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 32012 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 343E520C81 for ; Tue, 17 Jun 2014 08:15:56 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id n16sf39307383oag.10 for ; Tue, 17 Jun 2014 01:15:56 -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=OZ3TIQHxw5MzFkMV61pMMnI9sQhrB7VoC877FF62/4k=; b=al7m9FGrYwE8p+1pWRu+SNhAPOirH97kO3gqleCNQXcTlKHzsVQpHhoSwVUhNmN1Yy RDiE5qpPDnC6LJswcSU3U8xi5Mr39PfN02pG6KXeruQi+kNS+ZFGab6M7mlTxAu1mnBA 4QMCYymRLMJNVJVEw7M/JxhGb+1XHbt4mUZspcPWaT2vjdnUsVwowryrCV9ZWd1HFoLh ATgL89K1MR/2IEnZvCMCWbORlO3p4o6JAMc7FJEbZT1YT8ueDdTBHhXK/nJtVoGG9lQ6 0vVIEtI4GMkJRIdqrTk/dzNKVuVN52106k7lpvDI3sc5P4RpRUNeB7nABrOTqbiCNq7Q 1R5A== X-Gm-Message-State: ALoCoQkp/0ojn/Feyf7Y/Y1rEcYks+L7qK3cqjKki9BhT26pwo26OC93xb2Gyqc5TePxo0mk5Xx2 X-Received: by 10.182.22.65 with SMTP id b1mr190207obf.10.1402992956155; Tue, 17 Jun 2014 01:15:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.239 with SMTP id l102ls4711166qgd.81.gmail; Tue, 17 Jun 2014 01:15:56 -0700 (PDT) X-Received: by 10.58.195.130 with SMTP id ie2mr20412285vec.3.1402992956045; Tue, 17 Jun 2014 01:15:56 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id cx7si5131322vcb.57.2014.06.17.01.15.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Jun 2014 01:15:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id i13so3550105veh.22 for ; Tue, 17 Jun 2014 01:15:55 -0700 (PDT) X-Received: by 10.58.110.106 with SMTP id hz10mr6340444veb.30.1402992955926; Tue, 17 Jun 2014 01:15:55 -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 vs6csp191804vcb; Tue, 17 Jun 2014 01:15:55 -0700 (PDT) X-Received: by 10.66.251.233 with SMTP id zn9mr31023829pac.67.1402992955179; Tue, 17 Jun 2014 01:15:55 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id rq4si16458893pac.66.2014.06.17.01.15.54 for ; Tue, 17 Jun 2014 01:15:55 -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 185CA6FF3D; Tue, 17 Jun 2014 08:15:40 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mail.openembedded.org (Postfix) with ESMTP id CCC3B6FEB0 for ; Tue, 17 Jun 2014 08:15:26 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id hi2so5327397wib.17 for ; Tue, 17 Jun 2014 01:15:26 -0700 (PDT) X-Received: by 10.194.119.34 with SMTP id kr2mr36258353wjb.34.1402992926795; Tue, 17 Jun 2014 01:15:26 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id gp6sm18801789wib.12.2014.06.17.01.15.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 01:15:26 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 17 Jun 2014 10:15:24 +0200 Message-Id: <1402992924-28244-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] 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.128.177 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 | 1 + 2 files changed, 90 insertions(+) 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..ad878e5 100644 --- a/meta-oe/recipes-devtools/php/php_5.4.14.bb +++ b/meta-oe/recipes-devtools/php/php_5.4.14.bb @@ -13,6 +13,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://phar-makefile.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ + file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ "