From patchwork Sun Jan 6 21:29:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 209831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A2B7F2C007E for ; Mon, 7 Jan 2013 08:34:38 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 48C628C5DC; Sun, 6 Jan 2013 21:34:36 +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 RKfOiUHQ+kYB; Sun, 6 Jan 2013 21:34:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B91878C5FF; Sun, 6 Jan 2013 21:33:00 +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 BB8E48F753 for ; Sun, 6 Jan 2013 21:30:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A9C9D200B2 for ; Sun, 6 Jan 2013 21:30:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Majc1SgVRbSA for ; Sun, 6 Jan 2013 21:30:41 +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 silver.osuosl.org (Postfix) with ESMTP id 12F991FE3C for ; Sun, 6 Jan 2013 21:30:41 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 5FD5C10F; Sun, 6 Jan 2013 22:30:41 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 553F3138 for ; Sun, 6 Jan 2013 22:30:40 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sun, 6 Jan 2013 22:29:38 +0100 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 26/28] xvkbd: turn into a generic-package 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 xvkbd was integrated has an autotools package, but it does not have a ./configure script. And to avoid executing the ./configure, the xvkbd-2.8-makefile.patch was creating a dummy .stamp_configured stamp file... Ugly. So, make xvkbd a normal generic package, with BUILD_CMDS and INSTALL_TARGET_CMDS, and get rid of the crappy part of the patch. Signed-off-by: Thomas Petazzoni --- package/xvkbd/xvkbd-2.8-makefile.patch | 5 ----- package/xvkbd/xvkbd.mk | 14 +++++++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/xvkbd/xvkbd-2.8-makefile.patch b/package/xvkbd/xvkbd-2.8-makefile.patch index e0ac21a..a8f6577 100644 --- a/package/xvkbd/xvkbd-2.8-makefile.patch +++ b/package/xvkbd/xvkbd-2.8-makefile.patch @@ -1,8 +1,3 @@ ---- a/.stamp_configured 2008-03-04 06:14:55.425005441 -0500 -+++ b/.stamp_configured 2008-03-05 08:42:53.000000000 -0500 -@@ -0,0 +1 @@ -+dummy -\ No newline at end of file --- a/Makefile 2008-03-04 06:14:55.425005441 -0500 +++ b/Makefile 2008-03-05 08:40:50.000000000 -0500 @@ -0,0 +1,2397 @@ diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index ae81f84..59085bf 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -7,8 +7,16 @@ XVKBD_VERSION = 3.2 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd -XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \ - CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib" +# Passing USRLIBDIR ensures that the stupid Makefile doesn't add +# /usr/lib to the library search path. +define XVKBD_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + USRLIBDIR="$(STAGING_DIR)/usr/lib" +endef + +define XVKBD_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef XVKBD_DEPENDENCIES = \ xlib_libICE \ @@ -21,5 +29,5 @@ XVKBD_DEPENDENCIES = \ xlib_libXt \ xlib_libXtst -$(eval $(autotools-package)) +$(eval $(generic-package))