Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/8] fluxbox: fix build against imlib2
Date: Thu, 03 Jan 2013 21:38:40 +0100	[thread overview]
Message-ID: <87sj6ingrz.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <d7aa4b5c9cd9aefcb9670572007dac718155df9b.1356907750.git.s.martin49@gmail.com> (Samuel Martin's message of "Sun, 30 Dec 2012 23:54:09 +0100")

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> * fix configure.in to take care of the given imlib2-prefix
 Samuel> * disable imlib2 support if imlib2 is not part of the selection

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

 Samuel> +++ b/package/fluxbox/fluxbox.mk
 Samuel> @@ -10,11 +10,19 @@ FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBO
 Samuel>  FLUXBOX_LICENSE = MIT
 Samuel>  FLUXBOX_LICENSE_FILES = COPYING
 
 Samuel> +FLUXBOX_AUTORECONF = YES
 Samuel> +
 Samuel>  FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 Samuel>  		   --x-libraries=$(STAGING_DIR)/usr/lib
 Samuel> -
 Samuel>  FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 Samuel> +ifeq ($(BR2_PACKAGE_IMLIB2),y)
 Samuel> +FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr

Imlib2 needs to be built with X11 support, otherwise linking fails, so
I've updated the test to handle this and committed, thanks.


-- 
Bye, Peter Korsgaard

  reply	other threads:[~2013-01-03 20:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-30 22:54 [Buildroot] [pull request] Pull request for branch for-master/misc-fixes Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 1/8] matchbox-lib: fix license info Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 2/8] fluxbox: fix build against imlib2 Samuel Martin
2013-01-03 20:38   ` Peter Korsgaard [this message]
2012-12-30 22:54 ` [Buildroot] [PATCH 3/8] package/Makefile.in: update/fix HOST_PATH variable Samuel Martin
2013-02-07  7:07   ` Arnout Vandecappelle
2013-02-07  8:27   ` Thomas Petazzoni
2013-02-07 16:48     ` Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 4/8] package/pkg-cmake.mk: make sure $(HOST_PATH) is in the PATH at configure time Samuel Martin
2013-02-07  7:08   ` Arnout Vandecappelle
2012-12-30 22:54 ` [Buildroot] [PATCH 5/8] dependencies: build a host python2 if no suitable one can be found Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 6/8] scons: add host-python2-if-needed dependency Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 7/8] scons: ensure $(HOST_DIR)/usr/bin is in the PATH when invoking $(SCONS) Samuel Martin
2012-12-30 22:54 ` [Buildroot] [PATCH 8/8] manual: add host python2 dependency section Samuel Martin
  -- strict thread matches above, loose matches on Subject: below --
2012-12-30 21:33 [Buildroot] [pull request] Pull request for branch for-master/misc-fixes Samuel Martin
2012-12-30 21:33 ` [Buildroot] [PATCH 2/8] fluxbox: fix build against imlib2 Samuel Martin

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=87sj6ingrz.fsf@dell.be.48ers.dk \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox