From patchwork Sun Dec 9 18:18:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 204767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 27DA22C01E5 for ; Mon, 10 Dec 2012 05:19:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D98F52527F; Sun, 9 Dec 2012 18:19:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kblg7ABqmBSe; Sun, 9 Dec 2012 18:19:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 55DFE3106A; Sun, 9 Dec 2012 18:19:10 +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 B78798F74B for ; Sun, 9 Dec 2012 18:19:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A9BF08144B for ; Sun, 9 Dec 2012 18:19:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kcoCTGR16nMK for ; Sun, 9 Dec 2012 18:19:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4AF3580BEB for ; Sun, 9 Dec 2012 18:19:06 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hn14so605007wib.10 for ; Sun, 09 Dec 2012 10:19:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=t2KtvxHtqkOA/4MBVdMNzHJSCW4TucRsiwsLxvGav9o=; b=xBPSbOGGXBUbEd0jmy1TUJTSX2+wzkWpAx2CiyVjO2Svk4uh4am/Ekzg47JnLyeTT2 VfWl887fuLW+j/DzQrr7kq9M/iJb+9wOFjxSBlL1Q67C5P76LpdTACIEH6wZI4xGbS57 p73l4DTatGASpTHzoMJK4v2zxApK42KQesn3ldRwJWlbc6EYZnPDvkF8Xktwbit7wnj0 3WRxs/P5cEqhVyLARW3dKar1ZOxcJwgUE2HrtYQBEwieVTIXTri9jqDMRqw+ZT31gFbG wjboU1zJgqu5Ja78LXpsk3xWQlh0A5KeOBAdMDfYHe7HSz32ybBrhD8RTM7uOnGcwOCd djnw== Received: by 10.180.74.20 with SMTP id p20mr7262307wiv.0.1355077144413; Sun, 09 Dec 2012 10:19:04 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id cf6sm8013561wib.3.2012.12.09.10.19.02 (version=SSLv3 cipher=OTHER); Sun, 09 Dec 2012 10:19:03 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 9 Dec 2012 19:18:43 +0100 Message-Id: <1355077123-5948-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1355077123-5948-1-git-send-email-s.martin49@gmail.com> References: <1355077123-5948-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH] 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 Signed-off-by: Samuel Martin --- 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