| Message ID | 1456217498-14520-1-git-send-email-lorenz.marcel@web.de |
|---|---|
| State | Dropped |
| Headers | show |
Hi, why does perl need less? Is this a hard dependency or optional? If optional, I would like to avoid bundling less in the toolchain, because that bloats the toolchain and lets the build take longer. -Michael On Tue, 2016-02-23 at 09:51 +0100, Marcel Lorenz wrote: > Update less to last version from Linux from Scratch. > LFS is prepared for tools build. Need for later Perl 5.22.x > integration. > > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > > --- > lfs/less | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/lfs/less b/lfs/less > index d9680c8..dbf66af 100644 > --- a/lfs/less > +++ b/lfs/less > @@ -1,7 +1,7 @@ > #################################################################### > ########### > # > # > # IPFire.org - A linux based > firewall # > -# Copyright (C) 2007 Michael Tremer & Christian > Schmidt # > +# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> > # > # > # > # This program is free software: you can redistribute it and/or > modify # > # it under the terms of the GNU General Public License as published > by # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 443 > +VER = 481 > > THISAPP = less-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -32,6 +32,17 @@ DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > > +# Normal build or /tools build. > +# > +ifeq "$(ROOT)" "" > + EXTRA_CONFIG = --prefix=/usr --sysconfdir=/etc > + TARGET = $(DIR_INFO)/$(THISAPP) > +else > + EXTRA_CONFIG = --prefix=/tools --sysconfdir=/tools/etc > + TARGET = $(DIR_INFO)/$(THISAPP)-tools > +endif > + > + > #################################################################### > ########### > # Top-level Rules > #################################################################### > ########### > @@ -40,7 +51,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 47db098fb3cdaf847b3c4be05ee954fc > +$(DL_FILE)_MD5 = 50ef46065c65257141a7340123527767 > > install : $(TARGET) > > @@ -70,7 +81,7 @@ $(subst %,%_MD5,$(objects)) : > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc > --disable-nls > + cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > @rm -rf $(DIR_APP)
Update less to last version from Linux from Scratch. LFS is prepared for tools build. Need for later Perl 5.22.x integration. Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> --- lfs/less | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)