From patchwork Tue Jul 3 09:20:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 140918 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp942186ljj; Tue, 3 Jul 2018 02:40:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfcWKw8I9sUIwXCIwHna+BjxmerblRJMfmqe6AlEd9FiNHZRLzRKfF+c4jX86S1G14QN1G/ X-Received: by 2002:a17:902:530a:: with SMTP id b10-v6mr25370863pli.316.1530610845868; Tue, 03 Jul 2018 02:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530610845; cv=none; d=google.com; s=arc-20160816; b=D8OBqnpZbKtdqZOTUjbY5hXoRZYBKQI6V2c1CuLsCFXJb7kL43R3gT8vbfKknLRQRs ecYN82Fc0M0FVI9K8o3VzsWO5qtUN/Cni+BIYFBR3+Bj/tO3xpzkMZr8OTstyzA1edlp qyCtq48wzXTZbjM/cr9nQq3N949zgb+85okHHtODkG+DWivNXwzl1WbLtlTC6SIj6lVt OPXiVhNEo1plrIfpCKj676trTGqd/1GRdcQlm4Nkt0Uc8500XXfUuDsJwsoKZDU8Ep0o rKlJxvFFDB3YceVKrn2SgrNHmOmffglqjztk146zks6kJ6Stihd0sNvvEROVDZ2PvaNc hRZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=QvxlDK4hX/F/jVRYSrk3MsMpRw3wY7B5SzOqVs8yE8s=; b=Ijm747wqn733TX8A6TF64RP61znQ8sCg0RjvETj8hu+/V42yhmYgG4MN1JDLTasdBY wT2BcpFc0xMnCgnQiyrYWOaWHddaVmlSN5hikCOEVsH9J9lZmgEKibADnkkQwHCnb4pR v6JRatkqBs7CntGs9bqfcbPCL6EIoCbiRRZXczq/QZeVoapM6RJCDbbNqXYMSGesrrNP TjBscnUQGX8NMuDLpXYERTzOqh/t+8ghXXsiquaiIOiv1Fn1At1RmUfVK3WOD1LgA4JU VckjA5GNglgdVnfto7x2fFlA2h4PqzkRC+0jMNKeAbijHsZNs4boG1a0NolsTPAvfsmL Ipfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=tnGmpv9u; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d36-v6si724934pla.484.2018.07.03.02.40.45; Tue, 03 Jul 2018 02:40:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=tnGmpv9u; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3C7DD78A5C; Tue, 3 Jul 2018 09:40:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by mail.openembedded.org (Postfix) with ESMTP id 269887754B for ; Tue, 3 Jul 2018 09:20:22 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id b8-v6so1172570wro.6 for ; Tue, 03 Jul 2018 02:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=4oN2jyIw+VdcO8+D52SWhj5a+SAHSLJLlsmffiipDtU=; b=tnGmpv9uLHRZ7ZQ9wPAFIk4hN3xwd9bYnjF5nvvKFdKIDWiyp/pscBT2Q9aJliKe+K dVVhQ9gRBAkNlGz06VXNmrfizaHTd6ej1+H5/U6l6lYHEAcH79X1HkieAJCwlxlDS66z MjzgJCUMifrEfgMrYg7QnW1GeADHHADd3lE0dH9lDUSVQBSQYT1/I8Envxmpzw+bItKX tdJeyK2OqnoU/9YfG5MPjZup1/BrBjYm9pSpL3/NvHRMu1fjwcF2ccDDstmdqIPlDw++ npGCNqJWt8sARnrijKJftgp9JuhITqz1ciq6Xa1VpPDUncLDI8H3d4BPO1XdP1iTMvFY gq0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4oN2jyIw+VdcO8+D52SWhj5a+SAHSLJLlsmffiipDtU=; b=pkJbVcgNmCeMQGW7QeyScCoQzKq4sY7387NnG1qDOotlW8IHjF23flNnSLse5JJqzf aSdwdzAriXHe1m27jwKKeU0Hg+qDSEKxu96SYTflDVNdHB0NT1gu546pWsp5E3BdgfK5 vftB4XM08wL0KJuEVnKf/cI/PVFw+Q9hQEzhclJ+Y0lM06X+jFrEXLkotNRlA2TYR49H uHZav0iQp2pGfF9JtwJavroXfi3uZYJWbNEp9fq1nTtO92B3dfKkjCrwZQLxllxLe1cM PzJnTp7KcwXRIz8umI7GPiSBc06vry7uUSOsgzTyOaiPtr7fxYbl/0ApaPzgEQukByGy c80w== X-Gm-Message-State: APt69E3H/jrxbZTudJmSzWpE/rgpjMqdmSQu+/kqUmqsCfrLxBCzlpZV bxLenGvT4qS79HnmPJ3qKrx30a+0 X-Received: by 2002:adf:9e48:: with SMTP id v8-v6mr11843146wre.277.1530609623387; Tue, 03 Jul 2018 02:20:23 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g75-v6sm1041872wmd.38.2018.07.03.02.20.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 02:20:22 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Jul 2018 10:20:15 +0100 Message-Id: <20180703092018.5018-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [oe] [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions 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 Add a dependency on lscpu as the processor information needs it, and os-release as that is used to identify the distribution. Signed-off-by: Ross Burton --- .../{phoronix-test-suite_7.8.0.bb => phoronix-test-suite_8.0.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_7.8.0.bb => phoronix-test-suite_8.0.1.bb} (86%) -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb similarity index 86% rename from meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb rename to meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb index 1f90a71256..b9401f2790 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "850843bd9252823e7e24bc0849773000" -SRC_URI[sha256sum] = "cd6c869841f28e4ac1e8a5e4cda05fafce9a523a6b4f0f3a47805efd30494d88" +SRC_URI[md5sum] = "3dc3a0e490e909f188379a9e05fd4780" +SRC_URI[sha256sum] = "6306549109c7254baf31edb385265b19557b5692217d2dfcf96f6fb17de8e842" S = "${WORKDIR}/phoronix-test-suite" @@ -29,7 +29,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" -RDEPENDS_${PN} += "bash python php-cli" +RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release" FILES_${PN} += " \ ${datadir}/phoronix-test-suite \ From patchwork Tue Jul 3 09:20:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 140919 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp943189ljj; Tue, 3 Jul 2018 02:42:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeeA9LJ/NY/hF9u2x4mTRfM5ph4aNubDVfEpQddBZ+zWGtlnDtlIRWgi9hvBGiDi2x6Jg0c X-Received: by 2002:a63:4203:: with SMTP id p3-v6mr23265764pga.184.1530610922181; Tue, 03 Jul 2018 02:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530610922; cv=none; d=google.com; s=arc-20160816; b=Dk/EcZUFdDdR7arebHGMc6NceFz2gLt8QtwsDJJJjUe/yB8DGrpV5VvBwCROD7X102 9SPNGn0tyNwk+H0rcofbq143yXRZwm1vD0SPNfrrg2c/Vp264xQOggf63BxoRK03cmlq T3MQk937kKgzKNH7gqK/JrQPMiEOqLUK6LsIs+IPgGig9qmWW4LQBDjxMu8sYN+K7pLM utKyfrA+jLFdSS77PkegWAM4mBrs9iGnVKTphjelRM91cM6RIeJHeLxbVAgNEFCEEgkG 8Rj5lc9D3MtIqlzpkGQGXifJlspurZXPOeJRkgrUj4hGPVlO/FW2Xv0n3Vtsa1TE/+np lZIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=/HExZk2zMDkW3iwGDLxIJwGnkaN9JJ9jE0xAmJu1gd8=; b=Gny+AcuIEKsiCwDuZMxHSYGyuwbDhJpBwCx3E0HRgPg1/xtRFaI+ujmCaint5qiLAX FWLFhS1NNa7XwPZlmnzrdkd4D/Em23NMBQoO34c05LBvwjbmD1TbqX3W1vBcTz3axy1I foHG+5xS3JaQ465soSNrofau+13Yjrk8GE+uIbfTM3UG9A+bezQKDyJoCA4ioKNFuQ29 BtFN459xFw92eWKyOocaEVMvj8h1r0xBql5G8gKfXLnNyROwxIdArsn39qLJdFX8gANg RneSao+Tw2+ZhbF72a+EQNxWmB4hLVpbLIUkqogY9hYn+IDJWOy9K0dawNVXogkBuMgB 0R7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=YIcfbpRv; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b5-v6si741278ple.417.2018.07.03.02.42.01; Tue, 03 Jul 2018 02:42:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=YIcfbpRv; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1F00E78AA3; Tue, 3 Jul 2018 09:41:59 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by mail.openembedded.org (Postfix) with ESMTP id 2FDB27754B for ; Tue, 3 Jul 2018 09:20:24 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id s11-v6so1171615wra.13 for ; Tue, 03 Jul 2018 02:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=OTWptpO0kg7NwDmQwRQHMWy7dKRrwOVDZXDtj/kp6SU=; b=YIcfbpRv0rB87ZmbjYhpiI3vR+Cofs2cu6EtVbvsyPshZ9L+9Z1MK4kqximynaBRFK e+UD7DufXo89h08Zrg5BwmEzNfpPbECImoYWEKN4IAbGcWPsfTJutnov2A1JbpX8aa4B cwtfl44DDJCeymV1If3w2nvF1OqoDBcvD2EhPtVwaI6M8s7OW331c0fF2XYlZUMJbTm3 jeIGd7aVK8ZviYZla3Rw+jRoZ2UmVYrDTE/p0/U4w/0LYfIuwV2RkG688wx+3gTWEgnt OuR0IGPiXVotLy6N1UscuvG4ylUWMkoG+IWy89N3qYFAX4IM4or0DttoMYAcYbAoQ72p 2oDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=OTWptpO0kg7NwDmQwRQHMWy7dKRrwOVDZXDtj/kp6SU=; b=bYGFH/hpZiUFFLsk2XTN8JcjYqD4DgjDKGlgl/u7r84a3n1Cy0bJsNMZ7JSGMtSL7T kD+F0J/EYlp44H7ihAei70A3G9fybW8ISxW344+o4/mIUVbMyRdXI0VeMSLjX0k/F5du sUSDLiwCVZL6NS07J5HKkp4aqd3fj/xripI3+0vU+LR0XoccLKt1HBXRog7ZRJ7UcVQJ wCkyemCILLwzynm9fBFodGR6AzbsudD18Zm44h8Q8MVrmVSxUp2jLJ6nCHKWoS05A8uA 66RFyZMtfAaR+uL21aApI1uOhRv9GSWFoIjDEcrJ6kvddInWp8ByzumF+9Vr+GDt3dDV eYpg== X-Gm-Message-State: APt69E1lAtufginhKygKXOvuZbH/yknT+kKiPptyceWq8yddcQ0GaMaH 7kHpkvHenI5pISrsGdUmoNQtqpTZ X-Received: by 2002:adf:d4c5:: with SMTP id w5-v6mr21239469wrk.185.1530609624487; Tue, 03 Jul 2018 02:20:24 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g75-v6sm1041872wmd.38.2018.07.03.02.20.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 02:20:23 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Jul 2018 10:20:16 +0100 Message-Id: <20180703092018.5018-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180703092018.5018-1-ross.burton@intel.com> References: <20180703092018.5018-1-ross.burton@intel.com> Subject: [oe] [PATCH 2/4] php: disable non-deterministic valgrind X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions 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 Valgrind support in PHP looks on the host for Valgrind headers, backport a patch from upstream so that Valgrind support is disabled by default. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/php/php.inc | 1 + meta-oe/recipes-devtools/php/php/valgrind.patch | 115 ++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 meta-oe/recipes-devtools/php/php/valgrind.patch -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 066b97cd26..f262d60d15 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -24,6 +24,7 @@ SRC_URI_append_class-target = " \ file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ + file://valgrind.patch \ " S = "${WORKDIR}/php-${PV}" diff --git a/meta-oe/recipes-devtools/php/php/valgrind.patch b/meta-oe/recipes-devtools/php/php/valgrind.patch new file mode 100644 index 0000000000..c3e232ba23 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/valgrind.patch @@ -0,0 +1,115 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 25ba60b1479eb332a7388732f3ee5467000fbe73 Mon Sep 17 00:00:00 2001 +From: Michael Heimpold +Date: Wed, 14 Feb 2018 14:46:17 +0100 +Subject: [PATCH] Fixed bug #75722: Rework valgrind detection + +As described in bug report #75722, the configure script (acinclude.m4) +currently searches for the valgrind header file and enables valgrind +support if found. + +When cross-compiling the searched paths are invalid for the target +platform because they belong to the host system. At the moment, there is +no way to tell the build system a dedicated path where to look for the +header file. + +This leads to the issue, that when cross-compiling eg. for ARMv5 platform, +that valgrind header file is detected - e.g. because host system is amd64 - +and support is enabled - but target platform will never support valgrind +(valgrind requires e.g. at least ARMv7). + +This change reworks the detection so that user could manually opt-in +valgrind support and optionally specify a directory where the build system +should look for the header file using the --with-valgrind option. +--- + NEWS | 4 ++++ + acinclude.m4 | 20 -------------------- + configure.ac | 30 +++++++++++++++++++++++++++++- + 3 files changed, 33 insertions(+), 21 deletions(-) + +diff --git a/NEWS b/NEWS +index 1faf13831ebd..5d65fd083357 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,10 @@ PHP NEWS + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| + ?? ??? 2018, PHP 7.2.5 + ++- Core: ++ . Fixed bug #75722 (Convert valgrind detection to configure option). ++ (Michael Heimpold) ++ + - Mbstring: + . Fixed bug #75944 (Wrong cp1251 detection). (dmk001) + . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1). +diff --git a/acinclude.m4 b/acinclude.m4 +index d42d70853515..eb06cb7e363f 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -3249,23 +3249,3 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [ + + dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive. + m4_include([build/ax_check_compile_flag.m4]) +- +-dnl PHP_CHECK_VALGRIND +-AC_DEFUN([PHP_CHECK_VALGRIND], [ +- AC_MSG_CHECKING([for valgrind]) +- +- SEARCH_PATH="/usr/local /usr" +- SEARCH_FOR="/include/valgrind/valgrind.h" +- for i in $SEARCH_PATH ; do +- if test -r $i/$SEARCH_FOR; then +- VALGRIND_DIR=$i +- fi +- done +- +- if test -z "$VALGRIND_DIR"; then +- AC_MSG_RESULT([not found]) +- else +- AC_MSG_RESULT(found in $VALGRIND_DIR) +- AC_DEFINE(HAVE_VALGRIND, 1, [ ]) +- fi +-]) +diff --git a/configure.ac b/configure.ac +index 05f94f08a9c8..c5d9be978bda 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -753,7 +753,35 @@ if test "x$php_crypt_r" = "x1"; then + PHP_CRYPT_R_STYLE + fi + +-PHP_CHECK_VALGRIND ++dnl Check valgrind support ++PHP_ARG_WITH(valgrind, [whether to enable valgrind support], ++[ --with-valgrind=DIR Enable valgrind support], yes, no) ++ ++if test "$PHP_VALGRIND" != "no"; then ++ ++ AC_MSG_CHECKING([for valgrind header]) ++ ++ if test "$PHP_VALGRIND" = "yes"; then ++ SEARCH_PATH="/usr/local /usr" ++ else ++ SEARCH_PATH="$PHP_VALGRIND" ++ fi ++ ++ SEARCH_FOR="/include/valgrind/valgrind.h" ++ for i in $SEARCH_PATH ; do ++ if test -r $i/$SEARCH_FOR; then ++ VALGRIND_DIR=$i ++ fi ++ done ++ ++ if test -z "$VALGRIND_DIR"; then ++ AC_MSG_RESULT([not found]) ++ else ++ AC_MSG_RESULT(found in $VALGRIND_DIR) ++ AC_DEFINE(HAVE_VALGRIND, 1, [ ]) ++ fi ++ ++fi + + dnl General settings. + dnl ------------------------------------------------------------------------- \ No newline at end of file From patchwork Tue Jul 3 09:20:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 140920 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp943910ljj; Tue, 3 Jul 2018 02:42:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcL0IK06EmAuzaiHeWflzYr/fgpDr+zkDdqh8WpjpTULb0RtTmRHghenk2TCGASUtMaW2FG X-Received: by 2002:a62:e30c:: with SMTP id g12-v6mr2031370pfh.25.1530610979312; Tue, 03 Jul 2018 02:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530610979; cv=none; d=google.com; s=arc-20160816; b=h766tbB3CRPqmmv5Yv2Kk1oHvfVTBLC3jAmEJ7RcMXDlXk0GHVSyZi5krirKzuP7cC f9yySjQqEM1wYnSRnrdW8SrXS58mokqSokKRY2gBSN8MqR/Svnv3PMv1DuqKBqvOS7Df uk/5L3CwiwqymFwAW+skWZ/75Wp8iJFVW/M1GzqzUY4wu0rcVxC1zX6uLqNmoUboczVI LfPj4Gvt9yVEjz5ynSDaTHxELYxtoIxf5BlaJnDH+dqNXLKrmEdUjAx5Gen/USQb7xOP +H+2mYLtDi63GB9xEXoB8vnNQKWgAVHpIyDQa23k6mUUwi6ABW7QAQTCLJdcdXix+sKH 8pCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XEqL0RlLIMp6arEQ5yjFMSiVLz+NqfHJCLfW8YlozyY=; b=vIZfBz8jWj4tvJqXF7uTQ/8k3g0RIz8yt52zcyRZX3xUAylOp1puR67afEwq2pUnlO yxhq5xfJTogaBDe9a9uUPs1t8i1uUi8fk95/UwlrKnS6VMMXxFTEBovQdTdaT2SBv9Up xVUVviE0evZrxV4J4uFWbffNUGeuvEjfAdhJnwFq1db7Uo8xp4lwdyfFJwK1zTgbTOVI V7GLrXIRE+ZTc2JXuJJQQD39GttGGfrB8Ae66EXkzzhIc1798SmzhiBi0+XgihLpR2uc EfqUrhx2l4bojVyOR2aUm1MQ2mHj+TV/BxzrsHFLcM60ghEyHLlL8x/QYhGKgXM5xqRr pJ1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C9Fnv6Oo; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w12-v6si654740pgr.428.2018.07.03.02.42.59; Tue, 03 Jul 2018 02:42:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C9Fnv6Oo; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 679F478ABD; Tue, 3 Jul 2018 09:42:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id 5706B78AD6 for ; Tue, 3 Jul 2018 09:20:25 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id i139-v6so1499671wmf.4 for ; Tue, 03 Jul 2018 02:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=Sl4LOLfjksRwLW+TroT0X43WGTlWWOh8Dx6qY5Nb3Jw=; b=C9Fnv6OoMj/Qad8n4Hvm8981gYmFdkXr1zsmozbqu6fvLJYhDydc5kV9aWr5W1EBAL nEph8YCv4tbPo2mnt0rIqzYaksVj2853Q3aZe+cSDy0zsMHiS7DHm2ttZko/B44W2it0 hQ8LbYc8MV4oilTuI2nWUF0mbBGlyy95nylChuocdQ7eyy/NdlV9uk8gO91+5WaLf7jj /WvgDQBPTGS/6QNiEQP8Z/DZNK/5Z7itvYJrvhS5C/JtHZmoaXi8JNO4Nxf6cmEvNPV4 /KxnraStqN1fQYvkeBNwqtaNKnOk0QCtQJbKxqpovTScA7BXNSpF88+RmBOihjednBGY Z25A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Sl4LOLfjksRwLW+TroT0X43WGTlWWOh8Dx6qY5Nb3Jw=; b=OmLs3cIMAAzDQuWYDktUC38wrdpvstprkfz5fhB1k7zWccnrUz1H/9f1j5W68oEqS4 lcK/EQfxO7wsemlL18YVt8cM0FTb++Q5lgaEfNLu1vGtZC/oUXrrkWFU8k3dRgqQu0Pr dNjUjACi1ORGZuWc+3VZ5b0Vdf9OSQpfhis+KaqCRt7jRb3r/7FQ673LB9Fga+7sSdw4 QTZSNXFtMnD5ELM0Fm/0M1PO5Tc9Uhf2fd9epKokFPYcc6mjpLsh25vddev9+h5c3F79 7EVsvwI6ezcz7RQ0UjVzC+qX/4Ms1EHHODx+PY3UshgbM1ae04h2EdnDPxw3wJCRdGRu 4iBQ== X-Gm-Message-State: APt69E1Me7Tx72XqTxogHRWiwjkwBfCFyNa+T0mnJnoL2Op8Z02mhGxI Sf/V/RFahyCzjcwyiE0epMdQBcjD X-Received: by 2002:a1c:d543:: with SMTP id m64-v6mr9700379wmg.12.1530609625685; Tue, 03 Jul 2018 02:20:25 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g75-v6sm1041872wmd.38.2018.07.03.02.20.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 02:20:24 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Jul 2018 10:20:17 +0100 Message-Id: <20180703092018.5018-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180703092018.5018-1-ross.burton@intel.com> References: <20180703092018.5018-1-ross.burton@intel.com> Subject: [oe] [PATCH 3/4] php: actually enable openssl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions 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 The PHP recipe depends on OpenSSL but support is disabled unless you pass --with-openssl. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/php/php.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index f262d60d15..258b20e68c 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-mbstring \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ - ${COMMON_EXTRA_OECONF} \ + ${COMMON_EXTRA_OECONF} --with-openssl \ " CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes" From patchwork Tue Jul 3 09:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 140921 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp944617ljj; Tue, 3 Jul 2018 02:43:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJstf+1RCHZzT9qjoGLpv7KjI4a+O62rfTOEcN3nMAk6JMcpM+qIC7kPIGXiCtJNn4RwYY+ X-Received: by 2002:a63:a502:: with SMTP id n2-v6mr25328586pgf.263.1530611033019; Tue, 03 Jul 2018 02:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530611033; cv=none; d=google.com; s=arc-20160816; b=xHMgzDwbe3QAIlMnsFPQzZuGKvotgBINWxDET8JwoX47jrxxMx5DWdD4D2mLaae8BQ uHZDxCxZQg8f5Klt2Nne5bUPDw7YdqSBBpCLUEi6hqcmOkDIituVnDdSuvbttH53joqW kC7F9hyXyd6qPubgG674EXJJ4J172X9SGumMLtEimPclh5TRORoMFmfM8qwDrx0gvFYE /7xSmpYrOp8AQ8ptaLzsjzZSbuXxKk92+QQskeM1ydLhGDFm0QififlMCWNl5tFDdwsx SBSdVYFdukA9hC0uXdlPhSeF6/vUI3YYa+Ow190OP3AjyjdkH5f+6EuVz4zkQfpAs5u5 DgZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=KGRg6ezEQLJxL25903G7edrDcaDrOkIsr41RLp4euuk=; b=APMGmwbbgxyD1Q9kaETim76Ny22+8mel04aMJjQnr5I3jE9sI3AaphHFcS84gvtli9 vWmrD3orW7ONbu0vvHOEmdmoVjlx3wtBQuepYz2TxFl9GueZRJoxcQegF8eFh/xpISUW cUSEg7lty0WJ7Kni//rdICwWLYTGs2yhD6iZTnJ0eMzgQi/6d9OOkU36EnRCxQjsHA+o 8wJpOSzOEMexlRcGbpW2/n3IqHcEliE90Oe2pBpSqFCHGhi2S4McldwxmmSR/uEIPJM4 wI3xjpj5HJSjJYA7b4iWHby9hYKZjLKChnGVqX3hU9t3fpPQyWP/7a/64lqd8gpt2/uR C6IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=q9W1ZYtH; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i20-v6si667684pgb.547.2018.07.03.02.43.52; Tue, 03 Jul 2018 02:43:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=q9W1ZYtH; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 010B478A30; Tue, 3 Jul 2018 09:43:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by mail.openembedded.org (Postfix) with ESMTP id 526AF7754B for ; Tue, 3 Jul 2018 09:20:26 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id z13-v6so1457410wma.5 for ; Tue, 03 Jul 2018 02:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=KayEzWfAAkIR0EGHaeRWtyUhH08rIIg6npcAXCMkqHo=; b=q9W1ZYtH1rdqVnQBXuuK2CtY9zNarms/NtqMZbCb8q0jJEYKrX0Fs8CK+l8k0LHJfX qB4lT3ptLfj9jHNSCvmBxxHZ9es6cdg7es9ejYspGVcj1DPOvBxSgHHqshur/k6cgGpL tftUe8dpkImzRe3Z5ckPx+JfrdVvmDSMWgEE5Dn7C0Xu2F7WlQEeWlJYiv+J9MBzCnNB Tkw3LP/yAZhxXbpGLhHe0beyz0rGsJTnvRQ5XIppSuzeValHpvOtflL71wFoNmQSxS9/ 1lD2fRs+raNAsA/pdRkcAAilNU1BWqT99KnG/ONC4LC0jjsuLPwQ84anFe/zXoNhKP8F HaSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KayEzWfAAkIR0EGHaeRWtyUhH08rIIg6npcAXCMkqHo=; b=c0qZQM3jknnupRUh0doEOiHmd28alNjjcJDZZzCpPcGVvskXQsa5Ye9Yhqej7QssOR P8XkxBTHMkmyYlDf6myMPRIlYO+vcMGy1/qA1qkZYcfCtnRFWBUs2xQT1ll2F5iUQ5Ok iivFTljl8KnuKhyQ8kW28rFc4UCJo73s6u0ay9H7538qBXxZhXeOeAKqmZRum+WJXD6U VgRYlLMoPlvVt+fW+Ru26YznkFTp7y/HlMZMjHVqLKd5u8sX8hKwvu7vl/GQmXQxdDLd V8y0dsAHpLdDSdnoYnQDfw5t3iqzW8nq0IDd9BC8IcTQ2krJtthceIX6gTNyKIH0izwE 6tjw== X-Gm-Message-State: APt69E3a3h3oofANr2iqFEgWOmLdVUaKbYrgUABJhDzeDtonN6IulNY9 xqt6VLhMzqg7VtGPoJVoiTZcGl9F X-Received: by 2002:a1c:c8:: with SMTP id 191-v6mr9949110wma.115.1530609626694; Tue, 03 Jul 2018 02:20:26 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g75-v6sm1041872wmd.38.2018.07.03.02.20.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 02:20:25 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Jul 2018 10:20:18 +0100 Message-Id: <20180703092018.5018-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180703092018.5018-1-ross.burton@intel.com> References: <20180703092018.5018-1-ross.burton@intel.com> Subject: [oe] [PATCH 4/4] p7zip: simplify recipe X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions 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 The plugin-based 7z binary is mostly useless because it can't find the libraries. Simply just install 7za, and install a compatibility symlink for 7z. Signed-off-by: Ross Burton --- meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index d986da9043..13479a90fe 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -17,26 +17,9 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6 S = "${WORKDIR}/${BPN}_${PV}" do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/bin/* ${D}${bindir} -} - -# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx -EXTRA_OEMAKE_class-native = "all3" - -do_install_class-native() { - install -d ${D}${bindir} - install -d ${D}${bindir}/Codecs - install -m 0755 ${S}/bin/7* ${D}${bindir} - install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs - - # Create a shell script wrapper to execute next to 7z.so - mv ${D}${bindir}/7z ${D}${bindir}/7z.bin - cat > ${D}${bindir}/7z << 'EOF' -#!/bin/sh -exec "$(dirname "$0")"/7z.bin "$@" -EOF - chmod 0755 ${D}${bindir}/7z + install -d ${D}${bindir} + install -m 0755 ${S}/bin/* ${D}${bindir} + ln -s 7za ${D}${bindir}/7z } BBCLASSEXTEND = "native"