All of lore.kernel.org
 help / color / mirror / Atom feed
From: Blue Swirl <blauwirbel@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>, Jacob Meuser <jakemsr@openbsd.org>
Cc: qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] Re: [PATCH] Give sdl-config higher priority than pkg-config
Date: Sun, 14 Feb 2010 16:14:29 +0200	[thread overview]
Message-ID: <f43fc5581002140614t5428171ao9d71903421422bfe@mail.gmail.com> (raw)
In-Reply-To: <4B77E6CF.7000901@redhat.com>

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.  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@

  reply	other threads:[~2010-02-14 14:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-14  7:23 [Qemu-devel] [PATCH] Give sdl-config higher priority than pkg-config Blue Swirl
2010-02-14 12:04 ` [Qemu-devel] " Paolo Bonzini
2010-02-14 14:14   ` Blue Swirl [this message]
2010-02-14 14:47     ` Paolo Bonzini
2010-02-14 15:19   ` Jacob Meuser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f43fc5581002140614t5428171ao9d71903421422bfe@mail.gmail.com \
    --to=blauwirbel@gmail.com \
    --cc=jakemsr@openbsd.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.