From patchwork Tue May 23 10:22:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 765845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wXBRL5RScz9sP4 for ; Tue, 23 May 2017 20:22:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0106A860F2; Tue, 23 May 2017 10:22:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mmZl6z2qN8BV; Tue, 23 May 2017 10:22:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D07C0860FA; Tue, 23 May 2017 10:22:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 234D91C0E0E for ; Tue, 23 May 2017 10:22:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1D6BA86861 for ; Tue, 23 May 2017 10:22:18 +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 Y1VfT71P6wnz for ; Tue, 23 May 2017 10:22:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by fraxinus.osuosl.org (Postfix) with ESMTP id 54E90866BF for ; Tue, 23 May 2017 10:22:17 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id 1E548C01DE27F for ; Tue, 23 May 2017 11:22:12 +0100 (IST) Received: from vriera-linux.le.imgtec.org (192.168.154.36) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Tue, 23 May 2017 11:22:14 +0100 From: Vicente Olivert Riera To: Date: Tue, 23 May 2017 11:22:01 +0100 Message-ID: <20170523102201.65497-1-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 X-Originating-IP: [192.168.154.36] Subject: [Buildroot] [PATCH next] flex: only prevent the flex binary to be built for target, not for host 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We do want to build the flex binary when building host-flex since it's needed as a build dependency for other packages. Signed-off-by: Vicente Olivert Riera --- ...ntation.patch => 0001-flex-disable-documentation.patch} | 14 +------------- package/flex/flex.mk | 5 +++++ 2 files changed, 6 insertions(+), 13 deletions(-) rename package/flex/{0001-flex-disable-flex-binary-and-documentation.patch => 0001-flex-disable-documentation.patch} (55%) diff --git a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch b/package/flex/0001-flex-disable-documentation.patch similarity index 55% rename from package/flex/0001-flex-disable-flex-binary-and-documentation.patch rename to package/flex/0001-flex-disable-documentation.patch index d035ef40a..68bec128e 100644 --- a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch +++ b/package/flex/0001-flex-disable-documentation.patch @@ -1,4 +1,4 @@ -flex: prevent flex binary to be built +flex: disable documentation Since we prevent the flex binary to be built, we also need to prevent the documentation to be built, otherwise it will fail like this: @@ -21,15 +21,3 @@ diff -rup a/Makefile.in b/Makefile.in examples \ po \ tests \ -diff -rup a/src/Makefile.in b/src/Makefile.in ---- a/src/Makefile.in 2017-05-06 15:49:09.000000000 +0100 -+++ b/src/Makefile.in 2017-05-10 14:35:01.918464036 +0100 -@@ -90,7 +90,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = flex$(EXEEXT) -+bin_PROGRAMS = - @ENABLE_BOOTSTRAP_TRUE@noinst_PROGRAMS = stage1flex$(EXEEXT) - @CROSS_TRUE@am__append_1 = \ - @CROSS_TRUE@ ../lib/malloc.c \ diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 81cbdc1b7..aa6c026ee 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -15,6 +15,11 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 # we don't have a host-gettext/libintl HOST_FLEX_DEPENDENCIES = host-m4 +define FLEX_DISABLE_PROGRAM + $(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in +endef +FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM + # flex++ symlink is broken when flex binary is not installed define FLEX_REMOVE_BROKEN_SYMLINK rm -f $(TARGET_DIR)/usr/bin/flex++