From patchwork Wed Apr 22 18:09:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 463757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 423A4140134 for ; Thu, 23 Apr 2015 04:11:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=wSermvEL; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 739CDA127E; Wed, 22 Apr 2015 18:11:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qmCI907BmKvQ; Wed, 22 Apr 2015 18:11:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAD66A12AB; Wed, 22 Apr 2015 18:11:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 81F7B1C28A2 for ; Wed, 22 Apr 2015 18:11:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EB63E32FE6 for ; Wed, 22 Apr 2015 18:11:00 +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 Ku5bk-GdV7h5 for ; Wed, 22 Apr 2015 18:10:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by silver.osuosl.org (Postfix) with ESMTPS id DE4F432FE3 for ; Wed, 22 Apr 2015 18:10:19 +0000 (UTC) Received: by wgen6 with SMTP id n6so40753344wge.3 for ; Wed, 22 Apr 2015 11:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bcBZXF1iprCAb1LgzExA2v3/U5DtNxIljFoySf6mq7I=; b=wSermvELNC7+nkbfDiH1s/jGaPnZztThAXZdJdxzW34gDPW0I9NuUzVW5aYyasuMeZ gljhiwpkrnQ2M5gXMCo3JJTNa9UcYC6W2n1BepElrMJW1w0GzvZOjRIgCkfmsmM+Xh+F lLcYiwM2Gb96tOj62Ns2rWbC6RSsCWL0kRBhmUgM2R0FFfTyipoNVjQGULcBIiu3ZeEY Jg45bbky5EZ5sXVGYsb5kzp5rhsvZeoqDE0FHL0Xuq76p+9aJp7EzzPaRvLz2OZvtPEW YImroyKpMBVyxWOdjARqws/BLwuzCTggSwIRM6DRFiuN3nrXoi689RwRxsplqT7b5lZF gv3A== X-Received: by 10.194.78.12 with SMTP id x12mr51525334wjw.112.1429726218581; Wed, 22 Apr 2015 11:10:18 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by mx.google.com with ESMTPSA id gj7sm25448132wib.4.2015.04.22.11.10.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 11:10:18 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 22 Apr 2015 20:09:33 +0200 Message-Id: <65143442337102f480fc792f8f04505f6ab529dd.1429725549.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Building with the experimental support for compositing is broken: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o list.o stack.o composite-engine.o session.o mbtheme.o xml.o -lmb -lX11 -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXext -lXcomposite -lXdamage -lXfixes -lXrender -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lX11 -lexpat -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXfixes composite-engine.o: In function `gaussian': /home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65: undefined reference to `exp' That's because it forgets to link with -lm. However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as it still does not link with -lm at all. Furthermore, the package does not autoreconf, since it is missing the gconf m4 macros, and Buildroot does not have a package for gconf, hence we can not even patch Makefile.am and autoreconf. Patching Makefile.in (in addition to .am) could be a solution, but support for compositing is explicitly marked as being experimental. So, just forcibly disable it altogether. Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/matchbox/matchbox.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index be94414..4ec3fb5 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) -MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXdamage \ - xlib_libXrender -else -MATCHBOX_CONF_OPTS += --disable-composite -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) MATCHBOX_DEPENDENCIES += xlib_libXft endif