Re: [PATCH v2 2/6] Add tar extract install options override in installation processing.
- From
René Scharfe <l.s.r@web.de>
- Date
- Jan 20, 2018, 12:30 UTC
- Message-ID
- <1153e1c0-c7d5-3e0d-ce41-ffb1230164f7@web.de>
- In-Reply-To
- <20180119173406.13324-4-randall.s.becker@rogers.com>
Am 19.01.2018 um 18:34 schrieb randall.s.becker@rogers.com:
Show 20 quoted lines
> From: "Randall S. Becker" <rsbecker@nexbridge.com> > > * Makefile: Add TAR_EXTRACT_OPTIONS to allow platform options to be > specified if needed. The default is xof. > > Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> > --- > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 1a9b23b67..040e9eacd 100644 > --- a/Makefile > +++ b/Makefile > @@ -429,6 +429,9 @@ all:: > # running the test scripts (e.g., bash has better support for "set -x" > # tracing). > # > +# Define TAR_EXTRACT_OPTIONS if you want to change the default behaviour > +# from xvf to something else during installation.
"xof" instead of "xvf"?
Show 18 quoted lines
> +# > # When cross-compiling, define HOST_CPU as the canonical name of the CPU on > # which the built Git will run (for instance "x86_64"). > > @@ -452,6 +455,7 @@ LDFLAGS = > ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) > ALL_LDFLAGS = $(LDFLAGS) > STRIP ?= strip > +TAR_EXTRACT_OPTIONS = xof > > # Create as necessary, replace existing, make ranlib unneeded. > ARFLAGS = rcs > @@ -2569,7 +2573,7 @@ install: all > ifndef NO_GETTEXT > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)' > (cd po/build/locale && $(TAR) cf - .) | \ > - (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -) > + (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) $(TAR_EXTRACT_OPTIONS) -)
Hmm. TAR_EXTRACT_OPTIONS always needs to have f (or -f, or --file) at the end to go together with the following dash, meaning to extract from stdin. And x (or -x, or --extract) is probably needed in all cases as well. So wouldn't it make more sense to only put the o (or -o, or --no-same-owner) into TAR_EXTRACT_OPTIONS and enforce x and f?
> endif > ifndef NO_PERL > $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install >