From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 1 Apr 2018 16:26:41 +0200 Subject: [Buildroot] [v3 09/13] pkg-generic: introduce _SAME_SOURCE_AS In-Reply-To: <20180331142407.9522-9-maxime.hadjinlian@gmail.com> References: <20180331142407.9522-1-maxime.hadjinlian@gmail.com> <20180331142407.9522-9-maxime.hadjinlian@gmail.com> Message-ID: <20180401142641.GH2613@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 2018-03-31 16:24 +0200, Maxime Hadjinlian spake thusly: > This per package variable can be used to specify that a package shares > the same sources as another package. > > The use case here is for example linux-headers and linux, which share > the same sources (because they are the same upstream project), so we > don't want to download twice the kernel, nor store it multiple times > either. > > Make will automatically try to help by introducing leading and trailing > spaces when replacing a line-continuation '\', so we need to call > $(strip) on the variable. > > Signed-off-by: Maxime Hadjinlian > --- > package/pkg-generic.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b1342228c8..f3829e9912 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -428,7 +428,9 @@ endif > > $(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) > $(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) > -$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) > +$(2)_DL_DIR = $$(strip $$(if $$($(2)_SAME_SOURCE_AS), \ > + $$($$(call UPPERCASE,$$($(2)_SAME_SOURCE_AS))_DL_DIR), \ > + $$(DL_DIR)/$$($(2)_RAWNAME))) Indentation with TABs, please. May I suggest an alternate indentation (spaces here for easy display): $(2)_DL_DIR = $$(strip $$(if $$($(2)_SAME_SOURCE_AS), \ $$($$(call UPPERCASE,$$($(2)_SAME_SOURCE_AS))_DL_DIR), \ $$(DL_DIR)/$$($(2)_RAWNAME)) \ ) Regards, Yann E. MORIN. > $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) > > ifndef $(2)_SUBDIR > -- > 2.16.2 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'