From patchwork Wed Jul 20 15:35:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 2876 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2299423F42 for ; Wed, 20 Jul 2011 15:35:38 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id E145EA18761 for ; Wed, 20 Jul 2011 15:35:37 +0000 (UTC) Received: by qyk10 with SMTP id 10so3364689qyk.11 for ; Wed, 20 Jul 2011 08:35:37 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr7951559qcb.38.1311176136688; Wed, 20 Jul 2011 08:35:36 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs117140qcb; Wed, 20 Jul 2011 08:35:36 -0700 (PDT) Received: by 10.216.235.33 with SMTP id t33mr7681334weq.6.1311176135313; Wed, 20 Jul 2011 08:35:35 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id x11si698378wec.118.2011.07.20.08.35.34; Wed, 20 Jul 2011 08:35:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QjYoA-0002tC-Pz for ; Wed, 20 Jul 2011 15:35:34 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id AD4FC2E800C for ; Wed, 20 Jul 2011 15:35:34 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glcompbench X-Launchpad-Branch: ~glcompbench-dev/glcompbench/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 53 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 53: Check for the correct packages when building egl-gl flavor. Message-Id: <20110720153534.9174.67868.launchpad@loganberry.canonical.com> Date: Wed, 20 Jul 2011 15:35:34 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13468"; Instance="initZopeless config overlay" X-Launchpad-Hash: cac5f4054981752fcdeeda0c461bf8c43614b32d ------------------------------------------------------------ revno: 53 committer: Alexandros Frantzis branch nick: trunk timestamp: Wed 2011-07-20 18:33:07 +0300 message: Check for the correct packages when building egl-gl flavor. modified: wscript --- lp:glcompbench https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk You are subscribed to branch lp:glcompbench. To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription === modified file 'wscript' --- wscript 2011-07-18 15:00:13 +0000 +++ wscript 2011-07-20 15:33:07 +0000 @@ -69,9 +69,9 @@ mandatory = True) # Check conditional packages - req_pkgs = [('egl', 'egl', ctx.env.BUILD_EGL_ES2), + req_pkgs = [('egl', 'egl', ctx.env.BUILD_EGL_ES2 or ctx.env.BUILD_EGL_GL), ('glesv2', 'glesv2', ctx.env.BUILD_EGL_ES2), - ('gl', 'gl', ctx.env.BUILD_GLX)] + ('gl', 'gl', ctx.env.BUILD_GLX or ctx.env.BUILD_EGL_GL)] for (pkg, uselib, check_for) in req_pkgs: if check_for: ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs',