From mboxrd@z Thu Jan  1 00:00:00 1970
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 <blauwirbel@gmail.com>) 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 <blauwirbel@gmail.com>) 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 <qemu-devel@nongnu.org>; Sun, 14 Feb 2010 06:14:50 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <4B77E6CF.7000901@redhat.com>
References: <f43fc5581002132323j734da576ubb58151dc9dd5840@mail.gmail.com>
	<4B77E6CF.7000901@redhat.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 14 Feb 2010 16:14:29 +0200
Message-ID: <f43fc5581002140614t5428171ao9d71903421422bfe@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] Re: [PATCH] Give sdl-config higher priority than
	pkg-config
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Jacob Meuser <jakemsr@openbsd.org>
Cc: qemu-devel <qemu-devel@nongnu.org>

On Sun, Feb 14, 2010 at 2:04 PM, Paolo Bonzini <pbonzini@redhat.com> 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. =C2=A0I'm CCing the OpenBSD package mainta=
iner so
> that he can fix it.
>
> Upstream SDL has
>
> =C2=A0 =C2=A0--cflags)
> =C2=A0 =C2=A0 =C2=A0echo -I@includedir@/SDL @SDL_CFLAGS@
> =C2=A0 =C2=A0 =C2=A0;;
>
> in sdl-config.in and
>
> Cflags: -I${includedir}/SDL @SDL_CFLAGS@
>
> in sdl.pc.in, while OpenBSD has different values, so he modified sdl-conf=
ig
> 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@