From patchwork Tue Aug 25 14:51:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VC3oo2nm; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BbX6p6C25z9sTK for ; Wed, 26 Aug 2020 00:53:22 +1000 (AEST) Received: from localhost ([::1]:48788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaK8-0004YU-Q8 for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 10:53:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaIr-00028Y-Tp for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:01 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:38790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaIq-0000ZY-7a for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:01 -0400 Received: by mail-pj1-x1031.google.com with SMTP id ep8so1357515pjb.3 for ; Tue, 25 Aug 2020 07:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ahNl6xGv3lvDsVsmUoTS6dtgGoj1wQWvaseozR7dTqs=; b=VC3oo2nm6kHuWgur5na5NzNdVPxbq4uAbOgPohSlBaiJ96DmZObxO32rbAltY977xX OkJlJckRnOm4UN9E/aoIOjvMPiNHjJMytwhmvwZJco1EgxEjg09bnnWhW4vbyYmU/SXS ghT4GDgr94b4spD0SuNgStVDMNMb9RmUU8XvlsiD3NriNmzfYzrd6RsQt0JpqBmZ5Pki FvflRlWnQzNr7iMdxED94sGrcS4k7ulfi9zHwH4XFYqi8SEAqtxmHv/rVSgwWPXYQMEE gNpZ+so1c1WCZVBTkEn6mFdAMdRxvWS5qHWnPfzWnrauYzX9rONh3nYCNFbZC8p2LYVl ZdyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ahNl6xGv3lvDsVsmUoTS6dtgGoj1wQWvaseozR7dTqs=; b=iQoqHj3/Wu0H4+LA/JkTkO4ZrOwP2vS7XG/na8RKN+2w+Tp63Lzy4Ud1RCTkDFWVJR P/HLxWLp02iUtZ1SHVWLygsU8cSFDBytyA4Esp1GQmWwjsduUKKBqx0iitIDR3ocuMAT icPkHXlqEdtDeerAYY8fvxwW+I0gsQvgBO1wQsDxlwvWieuMKvBoLnoXt0O6swPlfbFF bgbfWGwiny8Ul64Qe1BPvbxrW+r8I1RVo9cHeqqkEArX4OugaCez7NM5YLRwO28N0qlA RqMxxdj1xgX0CWmSCn70FlwAb3J31ABqih1am/rdXXhZPHfYOocp6xZ/BJcjR0dQCfB/ IPYA== X-Gm-Message-State: AOAM530Jp2ghYCvMglXeLd4IVQ0uP6rNJcUJHIrQrap26+tj3uEqyNWZ fwOCneqUCq5bb+hDLEekwD8DPLrMLkLV8hie X-Google-Smtp-Source: ABdhPJz4eH0YDlM9Np3lgVR28cyBjFvCQWGDakFBgqBfzFtDxpcNLdnX8m4PJ3ucoA2Q9Jzl7X5xIA== X-Received: by 2002:a17:90b:3750:: with SMTP id ne16mr1922599pjb.6.1598367118413; Tue, 25 Aug 2020 07:51:58 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id m22sm3104383pja.36.2020.08.25.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:51:57 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Tue, 25 Aug 2020 22:51:32 +0800 Message-Id: <20200825145133.178-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825145133.178-1-luoyonggang@gmail.com> References: <20200825145133.178-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1031.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo Fixes this for msys2/mingw64 by remove the include_type for sdl2 discovery in meson --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index df5bf728b5..a3585881e1 100644 --- a/meson.build +++ b/meson.build @@ -224,8 +224,7 @@ if 'CONFIG_BRLAPI' in config_host brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split()) endif -sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static, - include_type: 'system') +sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static) sdl_image = not_found if sdl.found() # work around 2.0.8 bug