From patchwork Fri Mar 11 18:19:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 596449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 080DA1401B5 for ; Sat, 12 Mar 2016 05:20:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sSLGqYN/; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1F74FA6371; Fri, 11 Mar 2016 18:20:09 +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 mpvUSosmNVND; Fri, 11 Mar 2016 18:20:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D5C28A634A; Fri, 11 Mar 2016 18:20:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E7FA61CF176 for ; Fri, 11 Mar 2016 18:20:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E418A95EAA for ; Fri, 11 Mar 2016 18:20:04 +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 EdII2khbeG7Z for ; Fri, 11 Mar 2016 18:20:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1FDF995EC2 for ; Fri, 11 Mar 2016 18:20:04 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id n205so3861794wmf.2 for ; Fri, 11 Mar 2016 10:20:04 -0800 (PST) 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=6Ly1jXEAsheAP88lf2MT2Ozk4EXvSuPvbDQy7pIEAiU=; b=sSLGqYN/7zCiRO1A/vpMrwCkvZYsj5kYQe8fh8i1BWwmEvz/ST6pkezTy8WPIRccug JFEJWBL1wnobkrKZkhIxRKedOmD+gkkBUIQnh57rVTOVkzbRxdNcfuh3VK4QjPHBtrmW ir0wNNRpXD5/eL5n70XMK48f/8Er+2Ce11MTIHSn+an5VJYfaLoeqGYyK9Z7KiT85gfC ufKd4Gyby1rcdQSze82eoc1Lo1N5ubsjx/aB6m+lhq21N3spHNW0vQMICxe+EM4X1+sj MHqyMknNTctVMqfCGiz92yvry5YqvsOP1LYwyuhrZjDOpfgO0gCGC+rEiBIZdZWu+EpQ C52w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=6Ly1jXEAsheAP88lf2MT2Ozk4EXvSuPvbDQy7pIEAiU=; b=Mj9Fg+6se7jYG+5viwWbAO4cejfL9Cg8mnRr3JYncEr65t3t6o2Jq3yJIE7aTL3T7Y AmFeU0C5YfntYHDoaUfcZSVVMoQCrfQYepWZRfkPY+DabC8dxta1UvIzKHCVUIjeps4T y3VWk0dVj4eK3eYtOLZP86WpDv72Jp0Ra5HCvZyeUO6cqqVjF4eN1Hc6yxgW/VH4gWSy cYrD6Dt8Ft0eSdJjDuFvTazFXYDCXg74u5GcrdXqSp0OaYxyYIcLvR06NQY6TyaRRB9F GUDcCTXgP7D4drW4kl0mQM0UX2CW35JJ2JjLoULAz82m5AEb0Pxr5n93I7aFLAfta+ou mV8Q== X-Gm-Message-State: AD7BkJI+lPFUgqlB3Q08oA/GkGRVL82UKXzVllT9LO2EOZdBregcNQfuX0BOSZbJTh2PUw== X-Received: by 10.194.78.148 with SMTP id b20mr11200743wjx.71.1457720402715; Fri, 11 Mar 2016 10:20:02 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id 82sm3428728wmd.4.2016.03.11.10.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Mar 2016 10:20:01 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 11 Mar 2016 19:19:54 +0100 Message-Id: <19827565229346e7383cfd437c174735cd7f6698.1457720152.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 1/6] linux/perf: really do not build the documentation 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" The perf buildsystem, inside the kernel, is not really amenable to be easily used... Regarding the documentation, it will forcefully try to detect asciidoc and, with the latest versions, xmlto, completely disregarding what the user may provide. We currently pass ASCIIDOC= (the empty string) on the make command line, as an attempt to disable building the documentation, but that has no effect whatsoever on perf: that variable is not passed down to the sub-sub-make (yes, a two-level depth) that is responsible for building the documentation. We really do not want to build any of the documentation (the user can refer to the documentation on his own development machine), so we use a little dirty trick: we provide a GNUmakefile beside the existing Makefile for the documentation; GNUmakefile always takes precedence over a Makefile when both are present. We only provide a catch-all-no-recipe rule in that GNUmakefile, so it really does nothing useful, except avoid building the documentation. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire --- linux/linux-tool-perf.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/linux/linux-tool-perf.mk b/linux/linux-tool-perf.mk index 1070a1c..f9b295f 100644 --- a/linux/linux-tool-perf.mk +++ b/linux/linux-tool-perf.mk @@ -24,8 +24,7 @@ PERF_MAKE_FLAGS = \ NO_LIBPYTHON=1 \ DESTDIR=$(TARGET_DIR) \ prefix=/usr \ - WERROR=0 \ - ASCIIDOC= + WERROR=0 # We need to pass an argument to ld for setting the endianness when # building it for MIPS architecture, otherwise the default one will @@ -68,6 +67,19 @@ else PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1 endif +# We really do not want to build the perf documentation, because it +# has stringent requirement on the documentation generation tools, +# like xmlto and asciidoc), which may be lagging behind on some +# distributions. +# We name it 'GNUmakefile' so that GNU make will use it instead of +# the existing 'Makefile'. +define PERF_DISABLE_DOCUMENTATION + if [ -f $(@D)/tools/perf/Documentation/Makefile ]; then \ + printf "%%:\n\t@:\n" >$(@D)/tools/perf/Documentation/GNUmakefile; \ + fi +endef +LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION + # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build perf in $(@D)/tools/perf/ and not just # $(@D) so that it isn't built in the root directory of the kernel