summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-27 20:33:20 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-27 23:33:56 +0900
commita042043487eb4c7d39307b8e784ede1856455c3e (patch)
tree22bb9e1e0295776affa6ea6c7f863e8a4d84b718
parentf6a080047e960e8b1821a97850830286ce9dee1c (diff)
Do not include external library sources into packages
-rw-r--r--common.mk3
-rwxr-xr-xtool/make-snapshot1
2 files changed, 3 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 763305082d..20c6de7843 100644
--- a/common.mk
+++ b/common.mk
@@ -1282,8 +1282,9 @@ up::
yes::
no::
+EXTRACT_EXTLIBS = extract-extlibs
after-update:: $(REVISION_H)
-after-update:: extract-extlibs
+after-update:: $(EXTRACT_EXTLIBS)
after-update:: extract-gems
update-remote:: update-src update-download
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 131d7b91c9..869eb297b8 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -463,6 +463,7 @@ def package(vcs, rev, destdir, tmp = nil)
end
vars.delete("UNICODE_FILES") # for stable branches
vars["UNICODE_VERSION"] = $unicode_version if $unicode_version
+ vars["EXTRACT_EXTLIBS"] = ""
args = vars.dup
mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile')