From patchwork Sun Dec 30 21:33:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 208785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 943752C00B1 for ; Mon, 31 Dec 2012 08:34:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 32278A007B; Sun, 30 Dec 2012 21:34:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ngy5JTR+XGgU; Sun, 30 Dec 2012 21:33:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 18E11A015C; Sun, 30 Dec 2012 21:33:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 507118F79A for ; Sun, 30 Dec 2012 21:33:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 65B278A5C9 for ; Sun, 30 Dec 2012 21:33:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eLdAn35Qne2E for ; Sun, 30 Dec 2012 21:33:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 299978A4F2 for ; Sun, 30 Dec 2012 21:33:45 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id hn17so9074643wib.12 for ; Sun, 30 Dec 2012 13:33:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=eCU7jND0prMDQn/0+7qwCwMttYQ9uymfCwTACwWzWH0=; b=UHiQlL3cg1ejqRF7Q8+kdu5nGb/FbDrJy2deq0xvQ97qGv/XF6Ptw9w/ukqMDBsWiR D/Lu4ZrUppteIHu5DotVH3/+bptMw/tpQAdECuCvnja3gXWm4Ek65/ADRPrzck2S23kn PvoEMRZAO5UMcdM+j7ol6639QwvgEo0+OWLSs6mcapR6ZMPiu1xx9xP85lsoAfMKv189 nfUTFkEstXS4sO0JD4fsV7Juu+GSOAj112jHRVlqkKw55OwZC01G9P8P+2bqgYn4NaCO wvEhXe1X6K6HJBsT5t5Lms2dA7ZkNWKHqC3uzfB5W1MKQgSh73sUBokh0gaMwXUhTV/+ CehA== X-Received: by 10.180.107.5 with SMTP id gy5mr42904988wib.30.1356903224483; Sun, 30 Dec 2012 13:33:44 -0800 (PST) Received: from localhost.localdomain (ANantes-557-1-155-237.w2-1.abo.wanadoo.fr. [2.1.170.237]) by mx.google.com with ESMTPS id bz12sm66616498wib.5.2012.12.30.13.33.42 (version=SSLv3 cipher=OTHER); Sun, 30 Dec 2012 13:33:43 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 30 Dec 2012 22:33:26 +0100 Message-Id: X-Mailer: git-send-email 1.8.0.3 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 2/8] fluxbox: fix build against imlib2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net * fix configure.in to take care of the given imlib2-prefix * disable imlib2 support if imlib2 is not part of the selection --- package/fluxbox/fluxbox-1.3.2-fix-configure.patch | 19 +++++++++++++++++++ package/fluxbox/fluxbox.mk | 10 +++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 package/fluxbox/fluxbox-1.3.2-fix-configure.patch diff --git a/package/fluxbox/fluxbox-1.3.2-fix-configure.patch b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch new file mode 100644 index 0000000..2cb8273 --- /dev/null +++ b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch @@ -0,0 +1,19 @@ +Avoid to call the imlib2-config that may be installed on the host system +(even when --with-imlib2-prefix or --with-imlib2-exec-prefix is passed to +the configure script), which totally screws up the resulting linker flags. + +Inspired by: http://git.fluxbox.org/fluxbox.git/commit/?id=b178bed60b5bd8b2c9ed0cbc67fd729ff3820589 + +Signed-off-by: Samuel Martin + +--- fluxbox-1.3.2.orig/configure.in 2012-10-21 16:11:59.445749396 +0200 ++++ fluxbox-1.3.2/configure.in 2012-10-21 16:35:27.658390856 +0200 +@@ -443,8 +443,6 @@ if test x$enable_imlib2 = "xyes"; then + [ + IMLIB2=true + AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support]) +- IMLIB2_LIBS=`imlib2-config --libs` +- IMLIB2_CFLAGS=`imlib2-config --cflags` + LIBS="$LIBS $IMLIB2_LIBS" + CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS" + ], [ AC_MSG_RESULT(no)] diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk index 356c5a2..04ffb91 100644 --- a/package/fluxbox/fluxbox.mk +++ b/package/fluxbox/fluxbox.mk @@ -10,11 +10,19 @@ FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBO FLUXBOX_LICENSE = MIT FLUXBOX_LICENSE_FILES = COPYING +FLUXBOX_AUTORECONF = YES + FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib - FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv) +ifeq ($(BR2_PACKAGE_IMLIB2),y) +FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr +FLUXBOX_DEPENDENCIES += imlib2 +else +FLUXBOX_CONF_OPT += --disable-imlib2 +endif + define FLUXBOX_INSTALL_XSESSION_FILE [ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \ package/fluxbox/xsession $(TARGET_DIR)/root/.xsession