summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNARUSE, Yui <naruse@airemix.jp>2021-12-25 21:22:02 +0900
committerNARUSE, Yui <naruse@airemix.jp>2021-12-25 21:23:14 +0900
commitfb4df44d1670e9d25aef6b235a7281199a177edb (patch)
treec9e53ce3f63caef0c18ad3eea69fea701ee195ee
parent1636612cc1c1f624dfcd9d4251b83d460abba1e9 (diff)
Revert "Do not include external library sources into packages"v3_1_0
This reverts commit a042043487eb4c7d39307b8e784ede1856455c3e. (cherry picked from commit 8325094177de60d365b2b5507488f0b53d11c736)
-rw-r--r--common.mk3
-rwxr-xr-xtool/make-snapshot1
2 files changed, 1 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 8791069af7..664f750a16 100644
--- a/common.mk
+++ b/common.mk
@@ -1320,9 +1320,8 @@ 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 27618c7b83..5c66d5b76f 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -463,7 +463,6 @@ 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')