summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 14:49:57 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 14:58:45 +0100
commit983a7321339109f15f35cfc151b9be86168de2ef (patch)
treeb93957eedb935ecced84b2f73e0a4f3018f59d9c
parente5647667a4bce9147d97e92923b40e41baf1d4ce (diff)
downloadrabbitmq-server-git-983a7321339109f15f35cfc151b9be86168de2ef.tar.gz
make source-dist: "find -s" is not portable, use sort(1)
sort(1) supports the option -z to work with NUL-terminated strings, so we can keep "find -print0" and "xargs -0" and support filenames with whitespaces. As a reminder, LC_COLLATE=C is used to ensure the order is the same for everybody (ie. independent of the user's locale).
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d417ae3b08..27e13bd2af 100644
--- a/Makefile
+++ b/Makefile
@@ -244,23 +244,23 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
done
$(SOURCE_DIST).tar.gz: $(SOURCE_DIST)
- $(gen_verbose) LC_COLLATE=C find -s $(SOURCE_DIST) -print0 | \
+ $(gen_verbose) find $(SOURCE_DIST) -print0 | LC_COLLATE=C sort -z | \
xargs -0 $(TAR) -cnf - $(TAR_V) | \
$(GZIP) --best > $@
$(SOURCE_DIST).tar.bz2: $(SOURCE_DIST)
- $(gen_verbose) LC_COLLATE=C find -s $(SOURCE_DIST) -print0 | \
+ $(gen_verbose) find $(SOURCE_DIST) -print0 | LC_COLLATE=C sort -z | \
xargs -0 $(TAR) -cnf - $(TAR_V) | \
$(BZIP2) > $@
$(SOURCE_DIST).tar.xz: $(SOURCE_DIST)
- $(gen_verbose) LC_COLLATE=C find -s $(SOURCE_DIST) -print0 | \
+ $(gen_verbose) find $(SOURCE_DIST) -print0 | LC_COLLATE=C sort -z | \
xargs -0 $(TAR) -cnf - $(TAR_V) | \
$(XZ) > $@
$(SOURCE_DIST).zip: $(SOURCE_DIST)
$(verbose) rm -f $@
- $(gen_verbose) LC_COLLATE=C find -s $(SOURCE_DIST) -print0 | \
+ $(gen_verbose) find $(SOURCE_DIST) -print0 | LC_COLLATE=C sort -z | \
xargs -0 $(ZIP) $(ZIP_V) $@
clean:: clean-source-dist