From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1q65xn-0004Sx-LC for mharc-qemu-trivial@gnu.org; Mon, 05 Jun 2023 04:53:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q65xk-0004SY-Jh for qemu-trivial@nongnu.org; Mon, 05 Jun 2023 04:53:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q65xi-0003yR-E3 for qemu-trivial@nongnu.org; Mon, 05 Jun 2023 04:53:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685955193; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=sD4VKrApZ64AQmfEU+SxJqotDXeKPpXBuTnI+6y3ES8=; b=i6AaNvKQulvYKRgRpk37kl4Cb2gteH3aMkMGYzrbB8Gfugtyl2iPJW5r+rmjpCn4OqBbyG bzCwhP7kgfE91bZ9jOi/fI/3cU8FOiYl5trLBVtJMVZRk+M+e9/eWUHAWQ+ybs+WIdK3Sp /UydYenLGaJE5HneYytj5SKAgKV/djo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-150-5AjhV17YOseb7376Gf2w_Q-1; Mon, 05 Jun 2023 04:53:11 -0400 X-MC-Unique: 5AjhV17YOseb7376Gf2w_Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 678BA8032EF; Mon, 5 Jun 2023 08:53:11 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.224]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A2589E72; Mon, 5 Jun 2023 08:53:10 +0000 (UTC) Date: Mon, 5 Jun 2023 09:53:07 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Thomas Huth Cc: Paolo Bonzini , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org Subject: Re: [PATCH v2] meson.build: Use -Wno-undef only for SDL2 versions that need it Message-ID: Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20230602163452.521305-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230602163452.521305-1-thuth@redhat.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jun 2023 08:53:18 -0000 On Fri, Jun 02, 2023 at 06:34:52PM +0200, Thomas Huth wrote: > There is no need to disable this useful compiler warning for > all versions of the SDL. Unfortunately, various versions are > buggy (beside SDL 2.0.8, the version 2.26.0 and 2.26.1 are > broken, too, see https://github.com/libsdl-org/SDL/issues/6619 ), > but we can use a simple compiler check to see whether we need > the -Wno-undef or not. > > This also enables the printing of the version number with > good versions of the SDL in the summary of the meson output > again. > > Signed-off-by: Thomas Huth > --- > v2: Compile test code instead of hard-coding the version number > > meson.build | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/meson.build b/meson.build > index a61d3e9b06..a4c69616c3 100644 > --- a/meson.build > +++ b/meson.build > @@ -1273,10 +1273,16 @@ if not get_option('sdl').auto() or have_system > sdl_image = not_found > endif > if sdl.found() > - # work around 2.0.8 bug > - sdl = declare_dependency(compile_args: '-Wno-undef', > - dependencies: sdl, > - version: sdl.version()) > + # Some versions of SDL have problems with -Wundef > + if not cc.compiles(''' > + #include > + #include > + int main(int argc, char *argv[]) { return 0; } > + ''', dependencies: sdl, args: '-Wundef') Don't you need to pass '-Werror' there too, otherwise -Wundef will merely generate an warning and still succeed. > + sdl = declare_dependency(compile_args: '-Wno-undef', > + dependencies: sdl, > + version: sdl.version()) > + endif > sdl_image = dependency('SDL2_image', required: get_option('sdl_image'), > method: 'pkg-config') > else > -- > 2.31.1 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|