From patchwork Tue Dec 18 20:20:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 207200 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 194712C0094 for ; Wed, 19 Dec 2012 07:21:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DD7023012B; Tue, 18 Dec 2012 20:21:14 +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 oomHDa1yn7SI; Tue, 18 Dec 2012 20:21:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4FE37300E6; Tue, 18 Dec 2012 20:21:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CAB558F75B for ; Tue, 18 Dec 2012 20:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7B868103B83 for ; Tue, 18 Dec 2012 20:21:03 +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 7D1+zDnfQyG0 for ; Tue, 18 Dec 2012 20:20:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.32.191]) by fraxinus.osuosl.org (Postfix) with ESMTP id 581C810B8C8 for ; Tue, 18 Dec 2012 20:20:47 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id BAE2F188; Tue, 18 Dec 2012 21:20:53 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5E9C2DB for ; Tue, 18 Dec 2012 21:20:45 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 18 Dec 2012 21:20:42 +0100 Message-Id: <1355862043-17165-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH 1/2] xstroke: fix link issue 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 The allyespackageconfig builds have trigerred a link issue on xstroke. In fact, xstroke must be linked against Xrender, Xext and dl in addition to the other libraries it was already be linked against. We fix that by adding a patch that modifies configure.ac and Makefile.am, and enabling autoreconf for this package. In addition, since xstroke uses directly Xrender and Xext, we add those dependencies to the package. In practice, it doesn't change anything, since some of the xstroke dependencies were already pulling those libraries, but as xstroke uses directly Xrender and Xext, it makes sense to have them as dependencies as well. Signed-off-by: Thomas Petazzoni --- package/xstroke/Config.in | 2 ++ package/xstroke/xstroke-fix-link-issues.patch | 35 +++++++++++++++++++++++++ package/xstroke/xstroke.mk | 3 ++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/xstroke/xstroke-fix-link-issues.patch diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in index 54cb38e..1269934 100644 --- a/package/xstroke/Config.in +++ b/package/xstroke/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_XSTROKE select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXPM + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_XLIB_LIBXEXT help Handwriting recognition for X diff --git a/package/xstroke/xstroke-fix-link-issues.patch b/package/xstroke/xstroke-fix-link-issues.patch new file mode 100644 index 0000000..9a6d71e --- /dev/null +++ b/package/xstroke/xstroke-fix-link-issues.patch @@ -0,0 +1,35 @@ +Fix link issues by linking against all needed libraries + +Since gcc 4.6, all libraries that are directly used must be explicitly +passed on the command line. In the case of xstroke, linking against +Xrender, Xext and dl was missing. For the first two, they are added +through addition PKG_CHECK_MODULES() checks, for the latter, it is +added next to -lm and -lpthread in Makefile.am. + +Signed-off-by: Thomas Petazzoni +Index: b/Makefile.am +=================================================================== +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,7 +40,7 @@ + BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c + AM_YFLAGS = -d + +-xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst ++xstroke_LDADD = @XSTROKE_LIBS@ -ldl -lm -lpthread $(X_LIBS) -lXpm -lXtst + AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS) + + EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -26,7 +26,7 @@ + AC_CHECK_FUNCS([gettimeofday localtime_r]) + + AC_PATH_XTRA +-PKG_CHECK_MODULES(XSTROKE, xft) ++PKG_CHECK_MODULES(XSTROKE, [xft xrender xext]) + + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk index 3459545..83f347d 100644 --- a/package/xstroke/xstroke.mk +++ b/package/xstroke/xstroke.mk @@ -7,7 +7,8 @@ XSTROKE_VERSION = 0.6 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke -XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm +XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm xlib_libXrender xlib_libXext +XSTROKE_AUTORECONF = YES $(eval $(autotools-package))