From patchwork Sat May 17 16:53:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 349943 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 939051401F6 for ; Sun, 18 May 2014 02:53:47 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 538A389BE5; Sat, 17 May 2014 16:53:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jitvntfvjh8b; Sat, 17 May 2014 16:53:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 38DE089A19; Sat, 17 May 2014 16:53:41 +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 A22FE1BFA57 for ; Sat, 17 May 2014 16:53:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9F2038B03C for ; Sat, 17 May 2014 16:53:39 +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 fcJkVjOaoZL1 for ; Sat, 17 May 2014 16:53:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by fraxinus.osuosl.org (Postfix) with ESMTP id 865E88B03A for ; Sat, 17 May 2014 16:53:34 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 25D6F811; Sat, 17 May 2014 18:53:35 +0200 (CEST) Received: from localhost (AToulouse-651-1-158-31.w92-136.abo.wanadoo.fr [92.136.201.31]) by mail.free-electrons.com (Postfix) with ESMTPSA id DFE057A6; Sat, 17 May 2014 18:53:34 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sat, 17 May 2014 18:53:30 +0200 Message-Id: <1400345610-11771-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.9.3 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH] xlib_libXpm: fix build on noMMU architectures 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 Add a patch to libXpm to fix build on noMMU architectures. Fixes: http://autobuild.buildroot.org/results/c57/c571b0a9d9f36a445ea36a4bd609154f9a9bddd5/ Signed-off-by: Thomas Petazzoni --- .../xlib_libXpm/xlib_libXpm-01-fork-check.patch | 21 +++++++++++++++++++++ package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch b/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch new file mode 100644 index 0000000..fb4fb7d --- /dev/null +++ b/package/x11r7/xlib_libXpm/xlib_libXpm-01-fork-check.patch @@ -0,0 +1,21 @@ +Allow usage when fork() is not available + +When fork() is not available, we need to define NO_ZPIPE so that +libXpm doesn't try to fork/exec to use a pipe to uncompress compressed +.xpm files. There is obviously a loss of functionality, but loading +uncompressed .xpm files should continue to work. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -22,6 +22,7 @@ + + # Checks for library functions + AC_CHECK_FUNCS([strlcat]) ++AC_CHECK_FUNC([fork],[], AC_DEFINE(NO_ZPIPE)) + + # Obtain compiler/linker options for dependencies + PKG_CHECK_MODULES(XPM, xproto x11) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 86f331b..766724f 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -10,6 +10,8 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING XLIB_LIBXPM_INSTALL_STAGING = YES +# we patch configure.ac +XLIB_LIBXPM_AUTORECONF = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \ host-gettext