diff options
| author | NARUSE, Yui <naruse@airemix.jp> | 2021-12-25 20:59:20 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2021-12-25 21:06:10 +0900 |
| commit | 4bb3d4f6761d14e804a908481b7327821065c3c0 (patch) | |
| tree | d2224080310c2e01996dbc616bee7dd08e90e715 | |
| parent | 0381df9a8f54afb52c7cb253b35524b0341b2a33 (diff) | |
Revert "make-snapshot: add -extlibs option"
This reverts commit afa9d65d61857792508b1405835b07b78e24449c.
It prevents installing libffi.
(cherry picked from commit 1cc02078e503a18f6d1fcbd3e4d29c574895957d)
| -rwxr-xr-x | tool/make-snapshot | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 589d742e50..27618c7b83 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -24,7 +24,6 @@ $packages ||= nil $digests ||= nil $tooldir = File.expand_path("..", __FILE__) $unicode_version = nil if ($unicode_version ||= nil) == "" -$extlibs ||= "no" $colorize = Colorize.new def usage @@ -464,7 +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"] = "no" if $extlibs == "no" + 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') |