From patchwork Wed Apr 30 05:22:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29384 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E025B202FE for ; Wed, 30 Apr 2014 05:22:39 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rp18sf6369302iec.9 for ; Tue, 29 Apr 2014 22:22:39 -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=T2412bl9/YMdOtjNhn8vzQsNxC8gfEv0VJGHPlEsw1s=; b=nEgBBPOJw2ELsc9FzdrHD8dqA/oaremyWWxtkDEUbb0yPZpStj6SkaV1uuVbfG/Qms HnBa+LtzPfM3MBvhQ7c6XfekNC/xcUljcKyirtF0xP0cv/JRHTvBosOytJwBHCfdsGt1 +3peFjrBte6Kp3mWHPOTfvZriOMZfa2SjB/AijPYDxZxCA6rJTdXBEjiSaLmcKDcQcgM C0ab4i3zkIeGVIcv4DpRmTmI6+Y3OaiweQdNUYzlXrXRSP1B7eBCddRbb1SWFrHdhltV JcBR2BxP2y5bxbRfHqFunx1St86OauIIkhbXWxmT0aNbpCY8IwLjBxKlnqPn662hy7ux InGg== X-Gm-Message-State: ALoCoQnaTRYgUTAjtMV9I4mqO3jWpuxHG+m7fSyctB105jjTULYjl1VTa5wD4Tt6UKCQmsCZFiP4 X-Received: by 10.50.2.65 with SMTP id 1mr12508191igs.1.1398835359183; Tue, 29 Apr 2014 22:22:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.163 with SMTP id a32ls405959qgf.73.gmail; Tue, 29 Apr 2014 22:22:39 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr2033740vcb.2.1398835359055; Tue, 29 Apr 2014 22:22:39 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id iy9si5092340vec.141.2014.04.29.22.22.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 22:22:39 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id hu19so1551704vcb.37 for ; Tue, 29 Apr 2014 22:22:39 -0700 (PDT) X-Received: by 10.220.12.66 with SMTP id w2mr1941492vcw.15.1398835358979; Tue, 29 Apr 2014 22:22:38 -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.220.221.72 with SMTP id ib8csp250777vcb; Tue, 29 Apr 2014 22:22:38 -0700 (PDT) X-Received: by 10.66.148.134 with SMTP id ts6mr4372551pab.113.1398835358009; Tue, 29 Apr 2014 22:22:38 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id tm7si15504960pab.480.2014.04.29.22.22.37 for ; Tue, 29 Apr 2014 22:22:37 -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 86A4F65CD5; Wed, 30 Apr 2014 05:22:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mail.openembedded.org (Postfix) with ESMTP id 5E8FB60D67 for ; Wed, 30 Apr 2014 05:22:22 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id w62so281345wes.16 for ; Tue, 29 Apr 2014 22:22:23 -0700 (PDT) X-Received: by 10.194.58.79 with SMTP id o15mr287866wjq.62.1398835343435; Tue, 29 Apr 2014 22:22:23 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id dn4sm1172576wib.18.2014.04.29.22.22.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Apr 2014 22:22:22 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Apr 2014 07:22:20 +0200 Message-Id: <1398835340-20639-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] openldap: inherit autotools-brokensep 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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 remove hack that deletes headers from staging, it's not needed anymore. Signed-off-by: Koen Kooi --- meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb index 434029c..5c6f9ea 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb @@ -29,7 +29,7 @@ PR = "r1" # environments SRC_URI += "file://install-strip.patch" -inherit autotools +inherit autotools-brokensep # CV SETTINGS # Required to work round AC_FUNC_MEMCMP which gets the wrong answer @@ -151,20 +151,6 @@ do_configure() { oe_runconf } -#FIXME: this is a hack, at present an openldap build will pick up the header -# files from staging rather than the local ones (bad -I order), so remove -# the headers (from openldap-old.x) before compiling... -do_compile_prepend() { - ( - cd ${STAGING_INCDIR} - rm -f ldap.h ldap_*.h - ) - ( - cd ${STAGING_LIBDIR} - rm -f libldap* liblber* - ) -} - LEAD_SONAME = "libldap-${LDAP_VER}.so.*" # The executables go in a separate package. This allows the