1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not include external library sources into packages"

Browse Source 
This reverts commit a042043487eb4c7d39307b8e784ede1856455c3e.
This commit is contained in:
NARUSE, Yui 2021-12-25 21:22:02 +09:00
parent 82c8acbcfd
commit 8325094177
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.mk
View File

@ -1320,9 +1320,8 @@ up::
yes:: yes::
no:: no::
EXTRACT_EXTLIBS = extract-extlibs
after-update:: $(REVISION_H) after-update:: $(REVISION_H)
after-update:: $(EXTRACT_EXTLIBS) after-update:: extract-extlibs
after-update:: extract-gems after-update:: extract-gems
update-remote:: update-src update-download update-remote:: update-src update-download

1
tool/make-snapshot
View File

@ -463,7 +463,6 @@ def package(vcs, rev, destdir, tmp = nil)
end end
vars.delete("UNICODE_FILES") # for stable branches vars.delete("UNICODE_FILES") # for stable branches
vars["UNICODE_VERSION"] = $unicode_version if $unicode_version vars["UNICODE_VERSION"] = $unicode_version if $unicode_version
vars["EXTRACT_EXTLIBS"] = ""
args = vars.dup args = vars.dup
mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]} mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile') mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile')