From: llandwerlin at gmail.com <llandwerlin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 03/15] flex: convert to autotools infrastructure
Date: Sun, 17 Jan 2010 23:40:51 +0100 [thread overview]
Message-ID: <1263768063-24133-4-git-send-email-llandwerlin@gmail.com> (raw)
In-Reply-To: <1263768063-24133-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/flex/flex.mk | 125 ++++++++------------------------------------------
1 files changed, 19 insertions(+), 106 deletions(-)
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index d8a85bd..223f58e 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -9,118 +9,31 @@ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
-FLEX_CAT:=$(ZCAT)
-FLEX_BINARY:=flex
-FLEX_TARGET_BINARY:=usr/bin/flex
-$(DL_DIR)/$(FLEX_SOURCE):
- $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_SOURCE))
+# lex -> flex
+define FLEX_INSTALL_LEX
+cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
+endef
-$(DL_DIR)/$(FLEX_PATCH):
- $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_PATCH))
+define FLEX_UNINSTALL_LEX
+-rm $(TARGET_DIR)/usr/bin/lex
+endef
-flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
+FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
+FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
-$(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
- $(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(FLEX_PATCH),)
- toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
- if [ -d $(FLEX_DIR)/debian/patches ]; then \
- toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch; \
- fi
-endif
- $(CONFIG_UPDATE) $(FLEX_DIR)
- touch $@
-
-$(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked
- (cd $(FLEX_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --includedir=$(TARGET_DIR)/usr/include \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- )
- touch $@
-
-$(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FLEX_DIR)
-
-$(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
- $(MAKE1) \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- bindir=$(TARGET_DIR)/usr/bin \
- sbindir=$(TARGET_DIR)/usr/sbin \
- libexecdir=$(TARGET_DIR)/usr/lib \
- datadir=$(TARGET_DIR)/usr/share \
- sysconfdir=$(TARGET_DIR)/etc \
- sharedstatedir=$(TARGET_DIR)/usr/com \
- localstatedir=$(TARGET_DIR)/var \
- libdir=$(TARGET_DIR)/usr/lib \
- infodir=$(TARGET_DIR)/usr/info \
- mandir=$(TARGET_DIR)/usr/man \
- includedir=$(TARGET_DIR)/usr/include \
- -C $(FLEX_DIR) install
+# libfl installation
ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
- install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
- rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
- (cd $(TARGET_DIR)/usr/bin; ln -snf flex lex)
+define FLEX_INSTALL_LIBFL
+install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
+endef
-flex: $(TARGET_DIR)/$(FLEX_TARGET_BINARY)
+define FLEX_UNINSTALL_LIBFL
+-rm $(STAGING_DIR)/lib/libfl.a
+endef
-flex-clean:
- $(MAKE) \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- bindir=$(TARGET_DIR)/usr/bin \
- sbindir=$(TARGET_DIR)/usr/sbin \
- libexecdir=$(TARGET_DIR)/usr/lib \
- datadir=$(TARGET_DIR)/usr/share \
- sysconfdir=$(TARGET_DIR)/etc \
- sharedstatedir=$(TARGET_DIR)/usr/com \
- localstatedir=$(TARGET_DIR)/var \
- libdir=$(TARGET_DIR)/usr/lib \
- infodir=$(TARGET_DIR)/usr/share/info \
- mandir=$(TARGET_DIR)/usr/share/man \
- includedir=$(TARGET_DIR)/usr/include \
- -C $(FLEX_DIR) uninstall
- rm -f $(TARGET_DIR)/usr/bin/lex
-ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
- -rm $(STAGING_DIR)/lib/libfl.a
+FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
+FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
endif
- -$(MAKE) -C $(FLEX_DIR) clean
-
-flex-dirclean:
- rm -rf $(FLEX_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FLEX),y)
-TARGETS+=flex
-endif
+$(eval $(call AUTOTARGETS,package,flex))
--
1.6.5.7
next prev parent reply other threads:[~2010-01-17 22:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 22:40 [Buildroot] [pull request] Various fixes and new infrastructure conversion llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 01/15] flex: fix prog-ar patch llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 02/15] flex: bump to 2.5.35 llandwerlin at gmail.com
2010-01-17 22:40 ` llandwerlin at gmail.com [this message]
2010-01-17 22:40 ` [Buildroot] [PATCH 04/15] gperf: convert to autotools infrastructure llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 05/15] bash: remove CC variable when calling make llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 06/15] bash: fix configuration llandwerlin at gmail.com
2010-01-28 16:49 ` Peter Korsgaard
2010-01-17 22:40 ` [Buildroot] [PATCH 07/15] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 08/15] ncurses: fix path to patch ncurses5-config llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 09/15] readline: convert to autotools infrastructure llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 10/15] lua: conversion to new package infrastructure llandwerlin at gmail.com
2010-01-17 22:40 ` [Buildroot] [PATCH 11/15] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
2010-01-17 22:41 ` [Buildroot] [PATCH 12/15] package: Added post uninstall hooks llandwerlin at gmail.com
2010-01-17 22:41 ` [Buildroot] [PATCH 13/15] libxslt: fix dependency on libxml llandwerlin at gmail.com
2010-01-17 22:41 ` [Buildroot] [PATCH 14/15] dbus: fix target installation with BR2_HAVE_DEVFILES llandwerlin at gmail.com
2010-01-17 22:41 ` [Buildroot] [PATCH 15/15] external toolchain: fix strip of libraries llandwerlin at gmail.com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263768063-24133-4-git-send-email-llandwerlin@gmail.com \
--to=llandwerlin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox