From patchwork Tue Aug 6 14:04:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 18800 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7551B25DF6 for ; Tue, 6 Aug 2013 14:05:20 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id bq6sf865784qab.10 for ; Tue, 06 Aug 2013 07:05:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Jedlv0xMzzBAzkEd3ph0wi68WZ4NCoapfvMLATjlY3E=; b=Lbedg5IjxYJ8vUfjOXf7RjPtdeeFzEZM11Abe/7kQsbi/0qjGPxk15ClVIvYi7leKD cAYqy4XSnjudl+WuCVWse2zKLD14L4r12zC1qjxESzMbBfp0Lm7uQQGcSPwjfv4KvyYQ N70U66nLtp5dfBbcFZSQmstKrWCNZFaY1qCyS3Tvjj8UQzu08VfrEuRHNd/yL8s3SoYs GIe5FYvs0kU9HtlBJpob2OsQriNmlFsFb0so3+evlEQsuxi+7uTL0wHeNk+qt8v/bYcs dcTjGpQQBTZ33VLsE4yHMn1BgTb8or54zdEfX8sfG/15opfDlRgWOOzgGHJyfqm4FDA6 CZZg== X-Received: by 10.236.198.240 with SMTP id v76mr508690yhn.10.1375797920302; Tue, 06 Aug 2013 07:05:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.101.44 with SMTP id fd12ls235123qeb.98.gmail; Tue, 06 Aug 2013 07:05:20 -0700 (PDT) X-Received: by 10.52.22.45 with SMTP id a13mr359949vdf.53.1375797920195; Tue, 06 Aug 2013 07:05:20 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id ey4si313264vcb.122.2013.08.06.07.05.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 Aug 2013 07:05:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id cy12so447003veb.18 for ; Tue, 06 Aug 2013 07:05:19 -0700 (PDT) X-Gm-Message-State: ALoCoQn76RxOmzoeFmFeQ8Pb/Yade0h8sM0UTCrLoe3dZikEOdbdur/s1vnG75iu0lNO40xuzZg/ X-Received: by 10.58.6.210 with SMTP id d18mr376536vea.96.1375797919239; Tue, 06 Aug 2013 07:05:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp147486vcb; Tue, 6 Aug 2013 07:05:18 -0700 (PDT) X-Received: by 10.180.8.229 with SMTP id u5mr2125618wia.25.1375797917765; Tue, 06 Aug 2013 07:05:17 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id ct7si867863wjb.107.2013.08.06.07.05.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 06 Aug 2013 07:05:17 -0700 (PDT) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from aimless.elisa-laajakaista.fi (a91-156-63-85.elisa-laajakaista.fi [91.156.63.85]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 0A74026545; Tue, 6 Aug 2013 16:05:13 +0200 (CEST) From: Riku Voipio To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Riku Voipio Subject: [PATCH] qemu: pass CFLAGS via ./configure instead of a patch Date: Tue, 6 Aug 2013 17:04:53 +0300 Message-Id: <1375797893-3937-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , OE carries a patch to pass CFLAGS to qemu. However, we can avoid patching by passing CFLAGS with qemu's --extra-cflags option. Tested that building qemu-native still works without zlib-dev on host, and that qemu builds. Signed-off-by: Riku Voipio --- .../qemu/files/fix-configure-checks.patch | 22 ---------------------- meta/recipes-devtools/qemu/qemu.inc | 4 +--- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/files/fix-configure-checks.patch diff --git a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch deleted file mode 100644 index 294c220..0000000 --- a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch +++ /dev/null @@ -1,22 +0,0 @@ -In native builds, qemu can fail to find zlib development files in the native -sysroot and the build machine might not have zlib-dev packages installed. - -Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are -added and files in the sysroot can be found. - -Patch from Paul Eggleton, Comments by RP 28/11/10 - -Upstream-Status: Inappropriate [embedded specific] - -Index: qemu-1.4.0/configure -=================================================================== ---- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800 -+++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800 -@@ -286,6 +286,7 @@ - QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" - QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" - QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include" -+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" - if test "$debug_info" = "yes"; then - CFLAGS="-g $CFLAGS" - LDFLAGS="-g $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index c43f1ef..72988f5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -16,7 +16,6 @@ QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64" SRC_URI = "\ file://powerpc_rom.bin \ file://no-strip.patch \ - file://fix-configure-checks.patch \ file://larger_default_ram_size.patch \ " @@ -28,12 +27,11 @@ SRC_URI_append_class-native = "\ file://fix-libcap-header-issue-on-some-distro.patch \ " -EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman" +EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'" EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ --disable-curl \ " - export LIBTOOL="${HOST_SYS}-libtool" do_configure_prepend_class-native() {