From patchwork Sun Feb 14 14:14:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 45300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2B2D4B7CFA for ; Mon, 15 Feb 2010 01:15:29 +1100 (EST) Received: from localhost ([127.0.0.1]:40058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NgfFs-00048n-5P for incoming@patchwork.ozlabs.org; Sun, 14 Feb 2010 09:15:24 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NgfFM-00048J-UG for qemu-devel@nongnu.org; Sun, 14 Feb 2010 09:14:52 -0500 Received: from [199.232.76.173] (port=46838 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NgfFM-00047w-2q for qemu-devel@nongnu.org; Sun, 14 Feb 2010 09:14:52 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NgfFL-0004rs-BY for qemu-devel@nongnu.org; Sun, 14 Feb 2010 09:14:51 -0500 Received: from mail-pz0-f187.google.com ([209.85.222.187]:57355) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NgfFL-0004rn-0t for qemu-devel@nongnu.org; Sun, 14 Feb 2010 09:14:51 -0500 Received: by pzk17 with SMTP id 17so3124298pzk.4 for ; Sun, 14 Feb 2010 06:14:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=QjcgAcbfZ5gu6JphNSlXRu1c6LYHyMMoDPdALCtD/MY=; b=VUbbZCBwPWMSFSQMMNJq9yhJxgpJM9udE0DnA4lX4o8i++FvuoPd1LLqy7+g1mOZC4 zjoNln5+2AyCmnz3SDN4vPu87rj+zBifkRccCb1whgIgsWmyfGIq0iSLNvhJHBmr5kAk vV4Xt6Ft1nmvgwVF4musI/KgihrYSW107ePHo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=l2xR1hFFEOYTpMc3oOX1w+5DtXGG+HFR+gR6biprvmcHp4wKb2Y7v91gtCEX8Yn1nR ZXWpwSZFVFaEuuW/Gc3TNVGht6jSSab90fk+t5mSk7SPpkQCAZgva+MusHCyFOl63ej/ HkYJ5osN9myfmBfOLUPNusEMbLjHiSxA1rzNo= MIME-Version: 1.0 Received: by 10.141.12.4 with SMTP id p4mr2668330rvi.122.1266156889896; Sun, 14 Feb 2010 06:14:49 -0800 (PST) In-Reply-To: <4B77E6CF.7000901@redhat.com> References: <4B77E6CF.7000901@redhat.com> From: Blue Swirl Date: Sun, 14 Feb 2010 16:14:29 +0200 Message-ID: To: Paolo Bonzini , Jacob Meuser X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel Subject: [Qemu-devel] Re: [PATCH] Give sdl-config higher priority than pkg-config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Sun, Feb 14, 2010 at 2:04 PM, Paolo Bonzini wrote: > On 02/14/2010 08:23 AM, Blue Swirl wrote: >> >> On OpenBSD, pkg-config sdl --cflags forgets to add -I/usr/local/include >> which is needed for iconv.h (included from SDL.h). This makes SDL >> detection fail. >> >> Try sdl-config first, only if it fails try pkg-config. > > This breaks cross-compilation.  I'm CCing the OpenBSD package maintainer so > that he can fix it. > > Upstream SDL has > >    --cflags) >      echo -I@includedir@/SDL @SDL_CFLAGS@ >      ;; > > in sdl-config.in and > > Cflags: -I${includedir}/SDL @SDL_CFLAGS@ > > in sdl.pc.in, while OpenBSD has different values, so he modified sdl-config > apparently but not sdl.pc.in. Right. I think this patch against ports/devel/sdl should do the trick: --- patches/patch-sdl_pc_in.orig Sun Feb 14 14:08:41 2010 +++ patches/patch-sdl_pc_in Sun Feb 14 14:10:50 2010 @@ -8,4 +8,4 @@ -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ -Cflags: -I${includedir}/SDL @SDL_CFLAGS@ +Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @X_LIBS@ -+Cflags: -I${includedir}/SDL @SDL_CFLAGS@ @X_CFLAGS@ ++Cflags: -I${includedir} -I${includedir}/SDL @SDL_CFLAGS@ @X_CFLAGS@