Skip to content

Commit 4521e6b

Browse files
authored
Work around bug in tar 1.29 with --no-recursion and -T (#20942)
causing duplicate files and including directories it shouldn't be
1 parent 9e6b5fd commit 4521e6b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ light-source-dist: light-source-dist.tmp
497497
# Prefix everything with the current directory name (usually "julia"), then create tarball
498498
DIRNAME=$$(basename $$(pwd)); \
499499
sed -e "s_.*_$$DIRNAME/&_" light-source-dist.tmp > light-source-dist.tmp1; \
500-
cd ../ && tar -cz -T $$DIRNAME/light-source-dist.tmp1 --no-recursion -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT).tar.gz
500+
cd ../ && tar -cz --no-recursion -T $$DIRNAME/light-source-dist.tmp1 -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT).tar.gz
501501

502502
source-dist:
503503
@echo \'source-dist\' target is deprecated: use \'full-source-dist\' instead.
@@ -514,7 +514,7 @@ full-source-dist: light-source-dist.tmp
514514
# Prefix everything with the current directory name (usually "julia"), then create tarball
515515
DIRNAME=$$(basename $$(pwd)); \
516516
sed -e "s_.*_$$DIRNAME/&_" full-source-dist.tmp > full-source-dist.tmp1; \
517-
cd ../ && tar -cz -T $$DIRNAME/full-source-dist.tmp1 --no-recursion -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT)-full.tar.gz
517+
cd ../ && tar -cz --no-recursion -T $$DIRNAME/full-source-dist.tmp1 -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT)-full.tar.gz
518518

519519
clean: | $(CLEAN_TARGETS)
520520
@-$(MAKE) -C $(BUILDROOT)/base clean

0 commit comments

Comments
 (0)