From patchwork Tue Jun 17 07:22:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 32009 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2AFA620C81 for ; Tue, 17 Jun 2014 07:22:38 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf17425881ykp.1 for ; Tue, 17 Jun 2014 00:22:37 -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=ihhdD42JYW/o9WyckI12B2dk4IRZw/tjtzuLXAz4APg=; b=mfUrfYCB8YlKljHx19nMEuTuUa87eXH89Bx6+dDegTPdSBpV8b6q8b7/c9eBEc+QmC 3JK1VrckLRB8b/Wz52O/nxGssS+tpDvMt6lhdJYqXPjAz1hz8yWt7woq4HOJH7g9MFMY L9T3trU5tnazAJDLLrppeQsLlz03tnfjJvDQYozt0jJnUBiaEgQp1CSbiZ6vJqJyoppU DNWPO3/1mAiszHE4tzLULDIerOBSoOHXDv4SskRB4LA/LbkZ9wV6OU3hHGElQdRFx6tF 0tem8ir5jchaV9R6DnxkG4RsLqZ7Q1VCrKdvxQ6WbG++9IHZZ07rV4sWF63podr9dhN4 XisA== X-Gm-Message-State: ALoCoQkWaysJ7UdtQDg8XgavixQFKRxxO8wV+DltpUChIu4mWEYz+38yoIxcCtLWrfpITHvgn/Lv X-Received: by 10.52.4.164 with SMTP id l4mr2242240vdl.3.1402989757879; Tue, 17 Jun 2014 00:22:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.243 with SMTP id z106ls2324966qgz.54.gmail; Tue, 17 Jun 2014 00:22:37 -0700 (PDT) X-Received: by 10.52.118.99 with SMTP id kl3mr15265137vdb.18.1402989757795; Tue, 17 Jun 2014 00:22:37 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id te2si5077281vcb.101.2014.06.17.00.22.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Jun 2014 00:22:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so5927902vcb.21 for ; Tue, 17 Jun 2014 00:22:37 -0700 (PDT) X-Received: by 10.220.9.201 with SMTP id m9mr20323021vcm.5.1402989757636; Tue, 17 Jun 2014 00:22:37 -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 vs6csp189129vcb; Tue, 17 Jun 2014 00:22:37 -0700 (PDT) X-Received: by 10.66.227.4 with SMTP id rw4mr30695832pac.18.1402989756727; Tue, 17 Jun 2014 00:22:36 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id zt4si13547575pbc.55.2014.06.17.00.22.35 for ; Tue, 17 Jun 2014 00:22:36 -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 B59736FF64; Tue, 17 Jun 2014 07:22:29 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mail.openembedded.org (Postfix) with ESMTP id 088106BD26 for ; Tue, 17 Jun 2014 07:22:25 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id y10so6667513wgg.20 for ; Tue, 17 Jun 2014 00:22:26 -0700 (PDT) X-Received: by 10.180.106.1 with SMTP id gq1mr33667068wib.45.1402989745975; Tue, 17 Jun 2014 00:22:25 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id f6sm18549858wiy.19.2014.06.17.00.22.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 00:22:25 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 17 Jun 2014 09:22:17 +0200 Message-Id: <1402989737-32720-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [oe] [meta-webserver][PATCH] apache2(-native): use pkg-config for pcre 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.176 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 Also fixup apache2-native recipe to use autotools and SEPB. Signed-off-by: Koen Kooi --- .../recipes-httpd/apache2/apache2-native_2.4.9.bb | 23 +++++----- .../recipes-httpd/apache2/apache2_2.4.9.bb | 1 + ...nfigure-use-pkg-config-for-PCRE-detection.patch | 52 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb index aaa7e60..e50f2b8 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.9.bb @@ -6,9 +6,11 @@ DEPENDS = "expat-native pcre-native apr-native apr-util-native" SECTION = "net" LICENSE = "Apache-2.0" -inherit native +inherit autotools native -SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ + file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ + " S = "${WORKDIR}/httpd-${PV}" @@ -16,11 +18,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" SRC_URI[md5sum] = "2ef4e65353497606b24fa9bb3e5a3c40" SRC_URI[sha256sum] = "f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603" -do_configure () { - ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ - --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ - --prefix=${prefix} --datadir=${datadir}/apache2 -} +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ + --prefix=${prefix} --datadir=${datadir}/apache2 \ + " do_install () { install -d ${D}${bindir} ${D}${libdir} @@ -28,13 +29,15 @@ do_install () { install -m 755 support/apxs ${D}${bindir}/ install -m 755 httpd ${D}${bindir}/ install -d ${D}${datadir}/apache2/build + cp ${S}/build/*.mk ${D}${datadir}/apache2/build cp build/*.mk ${D}${datadir}/apache2/build - cp build/instdso.sh ${D}${datadir}/apache2/build + cp ${S}/build/instdso.sh ${D}${datadir}/apache2/build install -d ${D}${includedir}/apache2 + cp ${S}/include/* ${D}${includedir}/apache2 cp include/* ${D}${includedir}/apache2 - cp os/unix/os.h ${D}${includedir}/apache2 - cp os/unix/unixd.h ${D}${includedir}/apache2 + cp ${S}/os/unix/os.h ${D}${includedir}/apache2 + cp ${S}/os/unix/unixd.h ${D}${includedir}/apache2 cp support/envvars-std ${D}${bindir}/envvars chmod 755 ${D}${bindir}/envvars diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb index 33e197a..4788110 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.9.bb @@ -16,6 +16,7 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://apache-ssl-ltmain-rpath.patch \ file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \ file://npn-patch-2.4.7.patch \ + file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ file://init \ file://apache2-volatile.conf" diff --git a/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch b/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch new file mode 100644 index 0000000..63096db --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch @@ -0,0 +1,52 @@ +From d8837756f2a48adcfe5d645c39cf163d96eac76c Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 17 Jun 2014 09:10:57 +0200 +Subject: [PATCH] configure: use pkg-config for PCRE detection + +Signed-off-by: Koen Kooi +Upstream-Status: pending +--- + configure.in | 27 +++++---------------------- + 1 file changed, 5 insertions(+), 22 deletions(-) + +diff --git a/configure.in b/configure.in +index 864d7c7..da4138e 100644 +--- a/configure.in ++++ b/configure.in +@@ -215,28 +215,11 @@ fi + AC_ARG_WITH(pcre, + APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) + +-AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) +-if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then +- PCRE_CONFIG=$with_pcre/bin/pcre-config +-elif test -x "$with_pcre"; then +- PCRE_CONFIG=$with_pcre +-fi +- +-if test "$PCRE_CONFIG" != "false"; then +- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else +- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG]) +- fi +- case `$PCRE_CONFIG --version` in +- [[1-5].*]) +- AC_MSG_ERROR([Need at least pcre version 6.0]) +- ;; +- esac +- AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) +- APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) +- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) +-else +- AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) +-fi ++PKG_CHECK_MODULES([PCRE], [libpcre], [ ++ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) ++], [ ++ AC_MSG_ERROR([$PCRE_PKG_ERRORS]) ++]) + APACHE_SUBST(PCRE_LIBS) + + AC_MSG_NOTICE([]) +-- +1.9.3 +